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

Commit 3c17d776 authored by Colin Cross's avatar Colin Cross
Browse files

Remove tests from SettingsLibShell 

The tests and the robolectric libraries are already in
SettingsLibRoboTests, and shouldn't be in the package being tested.
Including robolectric in the package causes it to go through
proguard, which complains about missing dependencies.

Also remove the unnecessary libraries that are already included
through frameworks/base/packages/SettingsLib/common.mk.

Test: m -j ANDROID_COMPILE_WITH_JACK=false RunSettingsLibRoboTests
Change-Id: I11f007c4321bb9b147f62010eae046f75d1a52e3
parent b1669bf2

packages/SettingsLib/tests/robotests/Android.mk

+0 −21
Original line number Diff line number Diff line
@@ -25,30 +25,9 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_PRIVILEGED_MODULE := true



LOCAL_JAVA_LIBRARIES := \

    junit \

    platform-robolectric-prebuilt



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference \

    platform-system-robolectric \

    truth-prebuilt



LOCAL_AAPT_FLAGS := --auto-add-overlay \



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src)



LOCAL_JAR_EXCLUDE_FILES := none



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/res





include frameworks/base/packages/SettingsLib/common.mk



include $(BUILD_PACKAGE)