diff options
| author | Derek Sollenberger <djsollen@google.com> | 2017-09-25 15:45:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-25 15:45:34 +0000 |
| commit | 71b36912e0e641aefaeaab54084eaba3ef30b456 (patch) | |
| tree | 8036bb5743d05092f8f638320c4c75f454ead09e /rs | |
| parent | 7ace43b538cb74687704d059b8ed12a5c7beff68 (diff) | |
| parent | d938e5a2e2d89dda6a3562c530d28a353e8198ce (diff) | |
Merge "Reduce overhead by combining libskia and libhwui into a single library."
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/jni/Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index 21438e04f38c..0854b9582187 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -12,7 +12,7 @@ LOCAL_SHARED_LIBRARIES := \ libRS \ libcutils \ liblog \ - libskia \ + libhwui \ libutils \ libui \ libgui \ @@ -23,9 +23,7 @@ LOCAL_HEADER_LIBRARIES := \ LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ - frameworks/rs \ - frameworks/base/core/jni \ - frameworks/base/libs/hwui + frameworks/rs LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code |