Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d421ba0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ia971b2bc,I0001eb3d,I55a6951e 

* changes:
  Remove framework-protos from SystemUI
  Disable proguard for PluginDummyLib
  Enable multidex for dx
parents d52cdfb8 2b6aa352

packages/SystemUI/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
    android-support-v17-leanback



LOCAL_STATIC_JAVA_LIBRARIES := \

    framework-protos \

    SystemUI-tags \

    SystemUI-proto

packages/SystemUI/plugin/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -36,4 +36,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 


LOCAL_JAVA_LIBRARIES := SystemUIPluginLib



LOCAL_PROGUARD_ENABLED := disabled



include $(BUILD_PACKAGE)

services/tests/servicestests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ LOCAL_JNI_SHARED_LIBRARIES := \ 
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_JACK_FLAGS := --multi-dex native

LOCAL_DX_FLAGS := --multi-dex



LOCAL_STATIC_JAVA_LIBRARIES += ub-uiautomator