| commit | 9d421ba0501535e2824b5b56ca2db84d4f4bb6b4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Mar 27 23:37:06 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 27 23:37:10 2017 +0000 |
| tree | 8093fd58ff8e54468681fc5686c37bd4b260d5c7 | |
| parent | d52cdfb89f9acfb44f80fc366fd1a4c7337101f1 [diff] | |
| parent | 2b6aa352e5f8b432a934a228df7fe640249b36b6 [diff] |
Merge changes Ia971b2bc,I0001eb3d,I55a6951e * changes: Remove framework-protos from SystemUI Disable proguard for PluginDummyLib Enable multidex for dx
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 1ebfbad..635c96f 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk
@@ -38,7 +38,6 @@ android-support-v17-leanback LOCAL_STATIC_JAVA_LIBRARIES := \ - framework-protos \ SystemUI-tags \ SystemUI-proto
diff --git a/packages/SystemUI/plugin/Android.mk b/packages/SystemUI/plugin/Android.mk index 05ee6b2..e22dddb 100644 --- a/packages/SystemUI/plugin/Android.mk +++ b/packages/SystemUI/plugin/Android.mk
@@ -36,4 +36,6 @@ LOCAL_JAVA_LIBRARIES := SystemUIPluginLib +LOCAL_PROGUARD_ENABLED := disabled + include $(BUILD_PACKAGE)
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 2a8f4a3..bb4507d 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk
@@ -52,6 +52,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_JACK_FLAGS := --multi-dex native +LOCAL_DX_FLAGS := --multi-dex LOCAL_STATIC_JAVA_LIBRARIES += ub-uiautomator