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

Commit ba2280f2 authored by Jaewoong Jung's avatar Jaewoong Jung Committed by android-build-merger
Browse files

Merge "Convert Android.mk to Android.bp" 

am: bf0a7f67

Change-Id: If84c5863da04dba48d5836b075f3e38690581114
parents 140e1ff1 bf0a7f67

Android.bp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
android_app {

    name: "PackageInstaller",

    srcs: ["src/**/*.java"],

    static_libs: [

        "androidx.car_car",

        "androidx.transition_transition",

        "androidx.core_core",

        "androidx.media_media",

        "androidx.legacy_legacy-support-core-utils",

        "androidx.legacy_legacy-support-core-ui",

        "androidx.fragment_fragment",

        "androidx.appcompat_appcompat",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.legacy_legacy-preference-v14",

        "androidx.leanback_leanback",

        "androidx.leanback_leanback-preference",

        "car-list",

        "SettingsLib",

        "xz-java",

        "androidx.annotation_annotation",

    ],

    certificate: "platform",

    privileged: true,

    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

    // Comment for now unitl all private API dependencies are removed

    // LOCAL_SDK_VERSION := system_current

    platform_apis: true,

}

Android.mk

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := \

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



LOCAL_STATIC_ANDROID_LIBRARIES += \

    androidx.car_car \

    androidx.transition_transition \

    androidx.core_core \

    androidx.media_media \

    androidx.legacy_legacy-support-core-utils \

    androidx.legacy_legacy-support-core-ui \

    androidx.fragment_fragment \

    androidx.appcompat_appcompat \

    androidx.preference_preference \

    androidx.recyclerview_recyclerview \

    androidx.legacy_legacy-preference-v14 \

    androidx.leanback_leanback \

    androidx.leanback_leanback-preference \

    car-list \

    SettingsLib



LOCAL_STATIC_JAVA_LIBRARIES := \

    xz-java \

    androidx.annotation_annotation



LOCAL_PACKAGE_NAME := PackageInstaller

LOCAL_CERTIFICATE := platform



LOCAL_PRIVILEGED_MODULE := true



LOCAL_PROGUARD_FLAG_FILES := proguard.flags



# Comment for now unitl all private API dependencies are removed

# LOCAL_SDK_VERSION := system_current

LOCAL_PRIVATE_PLATFORM_APIS := true



include $(BUILD_PACKAGE)



ifeq (PackageInstaller,$(LOCAL_PACKAGE_NAME))

    # Use the following include to make our test apk.

    ifeq (,$(ONE_SHOT_MAKEFILE))

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

    endif

endif