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

Commit 0909191b authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Move overridden AOSP modules out of *_system mks"

parents 3a4a9665 811f2392

target/product/base_system.mk

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ PRODUCT_PACKAGES += \ 
    heapprofd_client \

    gatekeeperd \

    gpuservice \

    healthd \

    hid \

    hwservicemanager \

    idmap \

target/product/base_vendor.mk

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ PRODUCT_PACKAGES += \ 
    vndservice \

    vndservicemanager \



# Base modules and settings for the product partition.

PRODUCT_PACKAGES += \

    healthd \



# VINTF data for vendor image

PRODUCT_PACKAGES += \

    device_manifest.xml \

target/product/handheld_system.mk

+0 −19
Original line number Diff line number Diff line
@@ -36,52 +36,34 @@ PRODUCT_PACKAGES += \ 
    Bluetooth \

    BluetoothMidiService \

    BookmarkProvider \

    Browser2 \

    BuiltInPrintService \

    Calendar \

    CalendarProvider \

    Camera2 \

    cameraserver \

    CaptivePortalLogin \

    CertInstaller \

    clatd \

    clatd.conf \

    Contacts \

    DeskClock \

    DocumentsUI \

    DownloadProviderUi \

    EasterEgg \

    Email \

    ExactCalculator \

    ExternalStorageProvider \

    FusedLocation \

    Gallery2 \

    InputDevices \

    KeyChain \

    LatinIME \

    Launcher3QuickStep \

    librs_jni \

    ManagedProvisioning \

    MmsService \

    MtpDocumentsProvider \

    Music \

    MusicFX \

    NfcNci \

    OneTimeInitializer \

    PacProcessor \

    PrintRecommendationService \

    PrintSpooler \

    Provision \

    ProxyHandler \

    QuickSearchBox \

    screenrecord \

    SecureElement \

    Settings \

    SettingsIntelligence \

    SharedStorageBackup \

    SimAppDialog \

    StorageManager \

    SystemUI \

    Telecom \

    TelephonyProvider \

    TeleService \
@@ -89,7 +71,6 @@ PRODUCT_PACKAGES += \ 
    UserDictionaryProvider \

    VpnDialogs \

    vr \

    WallpaperCropper \





PRODUCT_SYSTEM_SERVER_APPS += \

target/product/handheld_vendor.mk

+24 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
# it definitely doesn't belong on other types of devices (if it

# does, use base_vendor.mk).

$(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk)



# /vendor packages

PRODUCT_PACKAGES += \

    audio.primary.default \

    DisplayCutoutEmulationCornerOverlay \
@@ -28,3 +30,25 @@ PRODUCT_PACKAGES += \ 
    power.default \

    SysuiDarkThemeOverlay \

    vibrator.default \



# /product packages

PRODUCT_PACKAGES += \

    Browser2 \

    Calendar \

    Camera2 \

    Contacts \

    DeskClock \

    Email \

    Gallery2 \

    LatinIME \

    Launcher3QuickStep \

    Music \

    OneTimeInitializer \

    PrintRecommendationService \

    Provision \

    QuickSearchBox \

    Settings \

    SettingsIntelligence \

    StorageManager \

    SystemUI \

    WallpaperCropper \

target/product/mainline_arm64.mk

+37 −0
Original line number Diff line number Diff line
@@ -30,3 +30,40 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ 
  root/init.zygote64_32.rc \

  system/etc/seccomp_policy/crash_dump.arm.policy \

  system/etc/seccomp_policy/mediacodec.policy \



# Modules that are to be moved to /product

PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \

  system/app/Browser2/Browser2.apk \

  system/app/Calendar/Calendar.apk \

  system/app/Camera2/Camera2.apk \

  system/app/DeskClock/DeskClock.apk \

  system/app/Email/Email.apk \

  system/app/Gallery2/Gallery2.apk \

  system/app/LatinIME/LatinIME.apk \

  system/app/LatinIME/oat/arm64/LatinIME.odex \

  system/app/LatinIME/oat/arm64/LatinIME.vdex \

  system/app/Music/Music.apk \

  system/app/PrintRecommendationService/PrintRecommendationService.apk \

  system/app/QuickSearchBox/QuickSearchBox.apk \

  system/bin/healthd \

  system/etc/init/healthd.rc \

  system/etc/vintf/manifest/manifest_healthd.xml \

  system/lib64/libjni_eglfence.so \

  system/lib64/libjni_filtershow_filters.so \

  system/lib64/libjni_jpegstream.so \

  system/lib64/libjni_jpegutil.so \

  system/lib64/libjni_latinime.so \

  system/lib64/libjni_tinyplanet.so \

  system/priv-app/CarrierConfig/CarrierConfig.apk \

  system/priv-app/Contacts/Contacts.apk \

  system/priv-app/Dialer/Dialer.apk \

  system/priv-app/Launcher3QuickStep/Launcher3QuickStep.apk \

  system/priv-app/OneTimeInitializer/OneTimeInitializer.apk \

  system/priv-app/Provision/Provision.apk \

  system/priv-app/Settings/Settings.apk \

  system/priv-app/SettingsIntelligence/SettingsIntelligence.apk \

  system/priv-app/StorageManager/StorageManager.apk \

  system/priv-app/SystemUI/SystemUI.apk \

  system/priv-app/SystemUI/oat/arm64/SystemUI.odex \

  system/priv-app/SystemUI/oat/arm64/SystemUI.vdex \

  system/priv-app/WallpaperCropper/WallpaperCropper.apk \