f416cf775e
This failure seems related to R8: https://sponge.corp.google.com/target?show=FAILED&sortBy=STATUS&id=4f1b303e-ef57-4dc6-9ebb-95ca5cda398e&target=com.android.settings.tests.unit: java.lang.InstantiationError: com.android.settings.bluetooth.Utf8ByteLengthFilter at com.android.settings.bluetooth.Utf8ByteLengthFilterTest.testFilter(Utf8ByteLengthFilterTest.java:34) at java.lang.reflect.Method.invoke(Native Method) at junit.framework.TestCase.runTest(TestCase.java:168) at junit.framework.TestCase.runBare(TestCase.java:134) at junit.framework.TestResult$1.protect(TestResult.java:115) at android.support.test.internal.runner.junit3.AndroidTestResult.runProtected(AndroidTestResult.java:73) at junit.framework.TestResult.run(TestResult.java:118) at android.support.test.internal.runner.junit3.AndroidTestResult.run(AndroidTestResult.java:51) at junit.framework.TestCase.run(TestCase.java:124) at android.support.test.internal.runner.junit3.NonLeakyTestSuite$NonLeakyTest.run(NonLeakyTestSuite.java:62) at android.support.test.internal.runner.junit3.AndroidTestSuite$2.run(AndroidTestSuite.java:101) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:458) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641) at java.lang.Thread.run(Thread.java:764) Bug: 74756073 Test: Run Settings tests, and the failure above is gone. Change-Id: I6071ae59f51ab5d56243774855ecc845267e7103
67 lines
1.6 KiB
Makefile
67 lines
1.6 KiB
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(call all-logtags-files-under, src)
|
|
|
|
LOCAL_MODULE := settings-logtags
|
|
|
|
include $(BUILD_STATIC_JAVA_LIBRARY)
|
|
|
|
# Build the Settings APK
|
|
include $(CLEAR_VARS)
|
|
|
|
# See b/74756073.
|
|
LOCAL_USE_R8=false
|
|
|
|
LOCAL_PACKAGE_NAME := Settings
|
|
LOCAL_PRIVATE_PLATFORM_APIS := true
|
|
LOCAL_CERTIFICATE := platform
|
|
LOCAL_PRIVILEGED_MODULE := true
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_USE_AAPT2 := true
|
|
|
|
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
|
|
LOCAL_STATIC_ANDROID_LIBRARIES := \
|
|
android-slices-builders \
|
|
android-slices-core \
|
|
android-slices-view \
|
|
android-support-v4 \
|
|
android-support-v13 \
|
|
android-support-v7-appcompat \
|
|
android-support-v7-cardview \
|
|
android-support-v7-preference \
|
|
android-support-v7-recyclerview \
|
|
android-support-v14-preference \
|
|
|
|
LOCAL_JAVA_LIBRARIES := \
|
|
bouncycastle \
|
|
telephony-common \
|
|
ims-common
|
|
|
|
LOCAL_STATIC_JAVA_LIBRARIES := \
|
|
android-arch-lifecycle-runtime \
|
|
android-arch-lifecycle-extensions \
|
|
guava \
|
|
jsr305 \
|
|
settings-logtags \
|
|
|
|
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
|
|
|
ifneq ($(INCREMENTAL_BUILDS),)
|
|
LOCAL_PROGUARD_ENABLED := disabled
|
|
LOCAL_JACK_ENABLED := incremental
|
|
LOCAL_JACK_FLAGS := --multi-dex native
|
|
endif
|
|
|
|
include frameworks/opt/setupwizard/library/common-gingerbread.mk
|
|
include frameworks/base/packages/SettingsLib/common.mk
|
|
|
|
include $(BUILD_PACKAGE)
|
|
|
|
# Use the following include to make our test apk.
|
|
ifeq (,$(ONE_SHOT_MAKEFILE))
|
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|
|
endif
|