commit d2045acc79c9b1d2b1a8420f05d9890b144a341e
author Jorge Lucangeli Obes <jorgelo@google.com> Fri Jan 08 13:21:48 2016 -0800
committer Jorge Lucangeli Obes <jorgelo@google.com> Fri Jan 08 13:21:48 2016 -0800
tree 1538940fa8ac2d38c5562feca4db646a3d241c23
parent 47bdb8a150b75a4619cec41d10046868b168acaa

Fix libminijail static build.

Using LOCAL_WHOLE_STATIC_LIBRARIES prevents targets including a static
libminijail from having to also include its dependencies.

Bug: 26099611
Change-Id: I7f569b9228a5a3a66f7a36ade8e9584ad5b7d8c0

Android.mk

diff --git a/Android.mk b/Android.mk
index 9295ef1..702c04b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -103,7 +103,7 @@
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(libminijailSrcFiles)
 
-LOCAL_STATIC_LIBRARIES := libminijail_generated $(minijailCommonLibraries)
+LOCAL_WHOLE_STATIC_LIBRARIES := libminijail_generated $(minijailCommonLibraries)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_STATIC_LIBRARY)