Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5e0f4f4 authored by Tingting Wang's avatar Tingting Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove FeatureHighlight lib from AOSP contacts." into ub-contactsdialer-g-dev

parents 659799f6 2fc12b16

Android.mk

+1 −26
Original line number Diff line number Diff line
@@ -27,14 +27,11 @@ LOCAL_AAPT_FLAGS := \ 
    --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 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    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 @@ LOCAL_MIN_SDK_VERSION := 21 


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))

libs/README.txt

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
featurehighlight.aar was generated from google3:

blaze build java/com/google/android/libraries/material/featurehighlight:featurehighlight.aar



Other libs are dependencies of featurehighlight.aar:

blaze build java/com/google/android/libraries/material/featurehighlight/appcompat:appcompat for libappcompat.jar

blaze build java/com/google/android/libraries/material/animation:animation for libanimation.jar

blaze build java/com/google/android/libraries/stitch/util:util for libutil_Objects.jar and libutil_Preconditions.jar

blaze build java/com/google/android/libraries/material/math:math for libmath.jar

blaze build java/com/google/android/libraries/material/path:path for libpath.jar

libs/featurehighlight.aar

deleted100644 → 0
−53.8 KiB

File deleted.

View file

libs/libanimation.jar

deleted100644 → 0
−21.3 KiB

File deleted.

View file

libs/libappcompat.jar

deleted100644 → 0
−3.76 KiB

File deleted.

View file