diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-30 22:18:47 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-07-30 22:18:47 -0700 |
| commit | 25fb6e59cb26300701c3e945c1e042af68e47e3b (patch) | |
| tree | 5681dedea765b885c6b66d85da9f24e232eef07f /NativeCode.mk | |
| parent | 5d3163e446f35f6cbb25259efc253d070c8c1142 (diff) | |
| download | libcore-25fb6e59cb26300701c3e945c1e042af68e47e3b.zip libcore-25fb6e59cb26300701c3e945c1e042af68e47e3b.tar.gz libcore-25fb6e59cb26300701c3e945c1e042af68e47e3b.tar.bz2 | |
Bring NativeCode.mk in line with the internal copy.
Change-Id: I4b42be83871a852d087ff9da6eeca8c5a08b1f19
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 78e64fd..3a22575 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -62,11 +62,10 @@ $(foreach dir, \ crypto/src/main/native dalvik/src/main/native luni/src/main/native, \ $(eval $(call include-core-native-dir,$(dir)))) -# Extract out the allowed LOCAL_* variables. Note: $(sort) also -# removes duplicates. -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)) +# Extract out the allowed LOCAL_* variables. +core_c_includes := libcore/include $(LOCAL_C_INCLUDES) +core_shared_libraries := $(LOCAL_SHARED_LIBRARIES) +core_static_libraries := $(LOCAL_STATIC_LIBRARIES) core_cflags := -Wall -Wextra -Werror core_cflags += -DJNI_JARJAR_PREFIX="com/android/" |