commit 395f79d2cf35f16b12ee0556a10432eee9e00c3e
author James Lemieux <jplemieux@google.com> Wed Dec 13 14:41:05 2017 -0800
committer James Lemieux <jplemieux@google.com> Sat Dec 16 00:57:57 2017 +0000
tree b847776f6317929036c446bc8fc8a671dfbc6ecf
parent 99c4ffb039230cb1b822e07e50e8f38104ade4bd

Adopt robolectric 3.5.1

Bug: 70685114
Test: make RunEmergencyInfoRoboTests
Change-Id: I8aeab1016dd51e2985add5fbec89edd70d2cc0a3

Android.mk

diff --git a/Android.mk b/Android.mk
index 2587d6f..55d68b5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,10 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
 
+LOCAL_PACKAGE_NAME := EmergencyInfo
 LOCAL_MODULE_TAGS := eng
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_PRIVILEGED_MODULE := true
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v14-preference \
     android-support-v13 \
@@ -26,21 +32,16 @@
     android-support-design \
     android-support-transition
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
-
 LOCAL_USE_AAPT2 := true
 
-LOCAL_PACKAGE_NAME := EmergencyInfo
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
 LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.emergency.*
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call first-makefiles-under, $(LOCAL_PATH))
\ No newline at end of file