Remove FeatureHighlight lib from AOSP contacts.
BUG 31039865
Change-Id: Iddbd3e62bcaf62f16ace928058297d7dac9c4a47
diff --git a/Android.mk b/Android.mk
index b19df65..2ed0e69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,14 +27,11 @@
--auto-add-overlay \
--extra-packages com.android.contacts.common \
--extra-packages com.android.phone.common \
- --extra-packages com.google.android.libraries.material.featurehighlight \
--extra-packages android.support.design \
--extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.cardview \
--extra-packages android.support.v7.recyclerview
-LOCAL_STATIC_JAVA_AAR_LIBRARIES := aar_feature_highlight
-
LOCAL_STATIC_JAVA_LIBRARIES := \
android-common \
android-support-design \
@@ -46,13 +43,7 @@
android-support-v4 \
com.android.vcard \
guava \
- libphonenumber \
- lib_animation \
- lib_math \
- lib_navigation_finder \
- lib_path \
- lib_util_objects \
- lib_util_preconditions
+ libphonenumber
LOCAL_PACKAGE_NAME := Contacts
LOCAL_CERTIFICATE := shared
@@ -65,21 +56,5 @@
include $(BUILD_PACKAGE)
-#########################################################################################
-
-include $(CLEAR_VARS)
-# Import FeatureHighlight aar and its dependencies.
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := aar_feature_highlight:libs/featurehighlight.aar \
- lib_animation:libs/libanimation.jar \
- lib_math:libs/libmath.jar \
- lib_navigation_finder:libs/libappcompat.jar \
- lib_path:libs/libpath.jar \
- lib_util_objects:libs/libutil_Objects.jar \
- lib_util_preconditions:libs/libutil_Preconditions.jar
-
-include $(BUILD_MULTI_PREBUILT)
-
-#########################################################################################
-
# Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))