commit 6fd82bdeeeb399a96ed82ca00ab657e9e2e3d503
author Jorge Lucangeli Obes <jorgelo@google.com> Tue Dec 15 09:28:52 2015 -0800
committer Jorge Lucangeli Obes <jorgelo@google.com> Tue Dec 15 09:28:52 2015 -0800
tree 00d9701eee991f46e21f47f6587ab2d8d1c20876
parent de02a5ba3578e0c3fb1d664d7109cd61e3d30e4c

Make library dependencies clearer.

The static library should not depend on a shared library.

Bug: 26099386
Change-Id: Ic4e2eb83ef68c9320053b50f8b28b101d99e5912

Android.mk

diff --git a/Android.mk b/Android.mk
index c19fa1d..5c671f9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,7 @@
 	util.c
 
 minijailCommonCFlags := -Wall -Werror
-minijailCommonSharedLibraries := libcap
+minijailCommonLibraries := libcap
 
 
 # Static library for generated code.
@@ -61,7 +61,7 @@
 LOCAL_SRC_FILES := $(libminijailSrcFiles)
 
 LOCAL_STATIC_LIBRARIES := libminijail_generated
-LOCAL_SHARED_LIBRARIES := $(minijailCommonSharedLibraries)
+LOCAL_SHARED_LIBRARIES := $(minijailCommonLibraries)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_SHARED_LIBRARY)
 
@@ -75,8 +75,7 @@
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(libminijailSrcFiles)
 
-LOCAL_STATIC_LIBRARIES := libminijail_generated
-LOCAL_SHARED_LIBRARIES := $(minijailCommonSharedLibraries)
+LOCAL_STATIC_LIBRARIES := libminijail_generated $(minijailCommonLibraries)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_STATIC_LIBRARY)
 
@@ -101,7 +100,7 @@
 	util.c \
 
 LOCAL_STATIC_LIBRARIES := libminijail_generated
-LOCAL_SHARED_LIBRARIES := $(minijailCommonSharedLibraries)
+LOCAL_SHARED_LIBRARIES := $(minijailCommonLibraries)
 include $(BUILD_NATIVE_TEST)
 
 
@@ -123,7 +122,7 @@
 	util.c \
 
 LOCAL_STATIC_LIBRARIES := libminijail_generated
-LOCAL_SHARED_LIBRARIES := $(minijailCommonSharedLibraries)
+LOCAL_SHARED_LIBRARIES := $(minijailCommonLibraries)
 include $(BUILD_NATIVE_TEST)