diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:32:56 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:32:56 -0800 |
| commit | e888585a72df3786111230769d73fee92dbbfb39 (patch) | |
| tree | 9be9526eddbc4d94771e034c6377e776323303d3 /NativeCode.mk | |
| parent | 6218bfec34349602e4aa7af9af632fe65549025a (diff) | |
| parent | 548fbbd0c596c1ec1bd4527de6ed839f509d1be8 (diff) | |
| download | libcore-e888585a72df3786111230769d73fee92dbbfb39.zip libcore-e888585a72df3786111230769d73fee92dbbfb39.tar.gz libcore-e888585a72df3786111230769d73fee92dbbfb39.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/libcore into mr1
Change-Id: I19ebeda37b4c3efa42f91ceb5d366ddccd699249
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 2a222b1..1aab901 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -53,6 +53,7 @@ endef # set up. include $(CLEAR_VARS) LOCAL_MODULE := $(core_magic_local_target) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk core_src_files := # Include the sub.mk files. @@ -65,9 +66,6 @@ $(foreach dir, \ core_c_includes := $(sort libcore/include $(LOCAL_C_INCLUDES) $(JNI_H_INCLUDE)) core_shared_libraries := $(sort $(LOCAL_SHARED_LIBRARIES)) core_static_libraries := $(sort $(LOCAL_STATIC_LIBRARIES)) -core_cflags := -fvisibility=hidden -core_cflags += '-DGCC_HIDDEN=__attribute__((visibility("hidden")))' -core_cppflags := -fvisibility-inlines-hidden # @@ -91,6 +89,7 @@ LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libexpat libicuuc libicui18n LOCAL_STATIC_LIBRARIES := $(core_static_libraries) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include LOCAL_SHARED_LIBRARIES += libstlport @@ -111,6 +110,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_LDLIBS += -ldl -lpthread LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore + LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libexpat libicuuc libicui18n libssl libcrypto libz-host LOCAL_STATIC_LIBRARIES := $(core_static_libraries) include $(BUILD_HOST_SHARED_LIBRARY) |