summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-05-03 16:39:22 -0700
committerElliott Hughes <enh@google.com>2012-05-03 16:39:22 -0700
commit89269cf98d263a4dd2e6e771e18c02a472b7bd78 (patch)
tree4104a5235e8432d0868c0f6a08cd6974501f0591
parent6113ce3be4ba7208bac7d9f0cad7e83104dbc8d3 (diff)
downloadframeworks_base-89269cf98d263a4dd2e6e771e18c02a472b7bd78.zip
frameworks_base-89269cf98d263a4dd2e6e771e18c02a472b7bd78.tar.gz
frameworks_base-89269cf98d263a4dd2e6e771e18c02a472b7bd78.tar.bz2
libnativehelper is implicitly available.
(And is moving for the PDK.) Bug: 6369821 Change-Id: I9e082ef294cfb2d70384255eb06d97d8cb92b382
-rw-r--r--native/android/Android.mk3
-rw-r--r--native/graphics/jni/Android.mk3
2 files changed, 2 insertions, 4 deletions
diff --git a/native/android/Android.mk b/native/android/Android.mk
index e2c99ee..00d11da 100644
--- a/native/android/Android.mk
+++ b/native/android/Android.mk
@@ -30,8 +30,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_C_INCLUDES += \
frameworks/base/native/include \
- frameworks/base/core/jni/android \
- dalvik/libnativehelper/include/nativehelper
+ frameworks/base/core/jni/android
LOCAL_MODULE:= libandroid
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk
index 7b741db..8b333e7 100644
--- a/native/graphics/jni/Android.mk
+++ b/native/graphics/jni/Android.mk
@@ -25,8 +25,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_C_INCLUDES += \
external/skia/include/core \
frameworks/base/native/include \
- frameworks/base/core/jni/android/graphics \
- dalvik/libnativehelper/include/nativehelper
+ frameworks/base/core/jni/android/graphics
LOCAL_MODULE:= libjnigraphics