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

Commit 08c60090 authored by Adrian DC's avatar Adrian DC
Browse files

Recorder: Upgrade to AOSP P common libraries and AAPT2 

 * Also match Jelly build rules

Change-Id: I26e6a425edc330c9b44594126ab23b218869ffa1
parent 284d8151

app/libs/constraint-layout-1.1.0.aar

deleted100644 → 0
−61.5 KiB

File deleted.

View file

app/libs/constraint-layout-solver-1.1.0.jar

deleted100644 → 0
−109 KiB

File deleted.

View file

app/libs/transition-27.0.2.aar

deleted100644 → 0
−172 KiB

File deleted.

View file

app/src/main/Android.mk

+7 −26
Original line number Diff line number Diff line
@@ -17,23 +17,17 @@ 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \

    frameworks/support/design/res \

    frameworks/support/v7/appcompat/res \

    frameworks/support/v7/cardview/res

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_SRC_FILES := $(call all-java-files-under, java)

LOCAL_SRC_FILES := \

    $(call all-java-files-under, java)



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages android.support.constraint \

    --extra-packages android.support.design \

    --extra-packages android.support.transition \

    --extra-packages android.support.v7.appcompat \

    --extra-packages android.support.v7.cardview



LOCAL_STATIC_JAVA_LIBRARIES += \

LOCAL_USE_AAPT2 := true



LOCAL_STATIC_ANDROID_LIBRARIES += \

    android-support-annotations \

    android-support-constraint-layout \

    android-support-constraint-layout-solver \

    android-support-design \

    android-support-v4 \
@@ -41,10 +35,6 @@ LOCAL_STATIC_JAVA_LIBRARIES += \ 
    android-support-v7-cardview \

    android-support-v7-recyclerview



LOCAL_STATIC_JAVA_AAR_LIBRARIES += \

    android-support-constraint-layout \

    android-support-transition-recorder



LOCAL_PACKAGE_NAME := Recorder

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true
@@ -54,13 +44,4 @@ LOCAL_PRIVATE_PLATFORM_APIS := true 


include $(BUILD_PACKAGE)



include $(CLEAR_VARS)



LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += \

    android-support-constraint-layout:../../libs/constraint-layout-1.1.0.aar \

    android-support-constraint-layout-solver:../../libs/constraint-layout-solver-1.1.0.jar \

    android-support-transition-recorder:../../libs/transition-27.0.2.aar



include $(BUILD_MULTI_PREBUILT)



include $(call all-makefiles-under,$(LOCAL_PATH))