Add metric id for anomaly fragments.

[android-x86/packages-apps-Settings.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 8888800..eeaad0c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,24 +1,53 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common ims-common
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
+LOCAL_SRC_FILES := \
+        $(call all-logtags-files-under, src)
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := settings-logtags
 
-LOCAL_SRC_FILES := \
-        $(call all-java-files-under, src) \
-        src/com/android/settings/EventLogTags.logtags
+include $(BUILD_STATIC_JAVA_LIBRARY)
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+# Build the Settings APK
+include $(CLEAR_VARS)
 
 LOCAL_PACKAGE_NAME := Settings
 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-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 \
+    core-oj \
+    telephony-common \
+    ims-common
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    jsr305 \
+    settings-logtags
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-include frameworks/opt/setupwizard/navigationbar/common.mk
+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)