summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-05-03 15:23:47 -0700
committerBrian Carlstrom <bdc@google.com>2013-05-03 15:23:47 -0700
commit62018a643f77d597ca9b32bc2eb5b58b34fe6f46 (patch)
tree0fdb6f8024993540d4eb46f4fcecee4823966a78
parent7dc0b702819701bbda50ff23670c01f9ea3cc646 (diff)
downloadandroid_dalvik-62018a643f77d597ca9b32bc2eb5b58b34fe6f46.tar.gz
android_dalvik-62018a643f77d597ca9b32bc2eb5b58b34fe6f46.tar.bz2
android_dalvik-62018a643f77d597ca9b32bc2eb5b58b34fe6f46.zip
Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES
Change-Id: I463a62898e5dd8eb01d1dfbaf71f67d8e1b4e67c
-rw-r--r--dalvikvm/Android.mk1
-rw-r--r--dexdump/Android.mk3
-rw-r--r--dexlist/Android.mk3
-rw-r--r--dexopt/Android.mk3
-rw-r--r--libdex/Android.mk1
-rw-r--r--vm/Dvm.mk1
6 files changed, 3 insertions, 9 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk
index 9f6432941..e52609816 100644
--- a/dalvikvm/Android.mk
+++ b/dalvikvm/Android.mk
@@ -23,7 +23,6 @@ dalvikvm_src_files := \
Main.cpp
dalvikvm_c_includes := \
- $(JNI_H_INCLUDE) \
dalvik/include
diff --git a/dexdump/Android.mk b/dexdump/Android.mk
index 7c22b600a..b825146d6 100644
--- a/dexdump/Android.mk
+++ b/dexdump/Android.mk
@@ -21,8 +21,7 @@ dexdump_src_files := \
DexDump.cpp
dexdump_c_includes := \
- dalvik \
- $(JNI_H_INCLUDE)
+ dalvik
dexdump_shared_libraries :=
diff --git a/dexlist/Android.mk b/dexlist/Android.mk
index 55602dd36..78d3c57e7 100644
--- a/dexlist/Android.mk
+++ b/dexlist/Android.mk
@@ -21,8 +21,7 @@ dexdump_src_files := \
DexList.cpp
dexdump_c_includes := \
- dalvik \
- $(JNI_H_INCLUDE)
+ dalvik
dexdump_shared_libraries :=
diff --git a/dexopt/Android.mk b/dexopt/Android.mk
index 256dcbd3f..60cb13644 100644
--- a/dexopt/Android.mk
+++ b/dexopt/Android.mk
@@ -24,8 +24,7 @@ local_src_files := \
local_c_includes := \
dalvik \
dalvik/libdex \
- dalvik/vm \
- $(JNI_H_INCLUDE)
+ dalvik/vm
include $(CLEAR_VARS)
ifeq ($(TARGET_CPU_SMP),true)
diff --git a/libdex/Android.mk b/libdex/Android.mk
index bb8d03b96..48263c9f7 100644
--- a/libdex/Android.mk
+++ b/libdex/Android.mk
@@ -36,7 +36,6 @@ dex_src_files := \
dex_include_files := \
dalvik \
- $(JNI_H_INCLUDE) \
external/zlib \
external/safe-iop/include
diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 2f53391b8..5c0f74ed1 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -222,7 +222,6 @@ ifeq ($(WITH_JIT),true)
endif
LOCAL_C_INCLUDES += \
- $(JNI_H_INCLUDE) \
dalvik \
dalvik/vm \
external/zlib \