summaryrefslogtreecommitdiff
path: root/native
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2016-11-03 16:16:47 -0700
committerColin Cross <ccross@android.com>2016-11-04 13:27:37 -0700
commit03b5d506bc2735e080863712d9d2e8ce6f7ecb43 (patch)
treecc107aa2cf2ad5ad885398b545e6c1bc43e46f85 /native
parent0bebfe76fc216ce2b1b7405eec93c9fe21f5a059 (diff)
Re-unite sources with their headers
Move all the includes for androidfw under a common base path for that library instead of frameworks/base/includes. Also fixes -Werror issues that resulted in no longer being -isystem. Test: builds Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7 Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7 (cherry picked from commit f6113af2d6f6eebee68d3ac510fe96d38a7a39e9)
Diffstat (limited to 'native')
-rw-r--r--native/graphics/jni/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk
index 175f73007484..4c8a9db85646 100644
--- a/native/graphics/jni/Android.mk
+++ b/native/graphics/jni/Android.mk
@@ -20,7 +20,8 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \
- libskia
+ libskia \
+ libandroidfw
LOCAL_C_INCLUDES += \
frameworks/base/native/include \