Merge "Convert to Soong" am: acbd94d76f

author Dan Willemsen <dwillemsen@google.com>

Tue, 15 May 2018 22:06:19 +0000 (15:06 -0700)

committer android-build-merger <android-build-merger@google.com>

Tue, 15 May 2018 22:06:19 +0000 (15:06 -0700)
author Dan Willemsen <dwillemsen@google.com>
Tue, 15 May 2018 22:06:19 +0000 (15:06 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 15 May 2018 22:06:19 +0000 (15:06 -0700)
diff --cc apct-tests/perftests/core/Android.mk

index 6156a0c,d386f57..0db23ef
--- 1/apct-tests/perftests/core/Android.mk
--- 2/apct-tests/perftests/core/Android.mk
+++ b/apct-tests/perftests/core/Android.mk
@@@ -23,8 -19,4 +23,6 @@@ LOCAL_JNI_SHARED_LIBRARIES := libperfte
   # Use google-fonts/dancing-script for the performance metrics
   LOCAL_ASSET_DIR := $(TOP)/external/google-fonts/dancing-script
   
+ +LOCAL_COMPATIBILITY_SUITE += device-tests
+ +
   include $(BUILD_PACKAGE)
- 
- include $(call all-makefiles-under, $(LOCAL_PATH))
diff --cc libs/androidfw/Android.bp
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Tue, 15 May 2018 22:06:19 +0000 (15:06 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 15 May 2018 22:06:19 +0000 (15:06 -0700)
		1	2
apct-tests/perftests/core/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
libs/androidfw/Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history