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

Commit 8add4997 authored by Justin Yun's avatar Justin Yun
Browse files

Add missing modules to the internal system image 

libmonkey_jni and uprobestats are defined in base_system.mk, but not
in aosp for now.
DeviceDiagnostics is also defined in handheld_system.mk
Submit these to internal only until it is upstreamed to aosp.

Bug: 365670526
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-userdebug
      && m
Ignore-AOSP-First: The module is internal-only.
Flag: NONE This does not change the existing behavior.
Change-Id: I7beb3ad6be7f5aa5d55c72de4e809cfbbf32f61b
parent d7a2d31a

target/product/generic/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -577,6 +577,7 @@ android_system_image { 
                "ContactsProvider", // base_system

                "CredentialManager", // handheld_system

                "DeviceAsWebcam", // handheld_system

                "DeviceDiagnostics", // handheld_system - internal

                "DocumentsUI", // handheld_system

                "DownloadProvider", // base_system

                "DownloadProviderUi", // handheld_system
@@ -693,6 +694,7 @@ android_system_image { 
                "android.system.virtualizationservice-ndk",

                "libgsi",

                "servicemanager",

                "uprobestats", // base_system - internal

            ],

        },

        both: {
@@ -765,6 +767,7 @@ android_system_image { 
                "libmedia_jni", // base_system

                "libmediandk", // base_system

                "libminui", // generic_system

                "libmonkey_jni", // base_system - internal

                "libmtp", // base_system

                "libnetd_client", // base_system

                "libnetlink", // base_system
@@ -793,6 +796,7 @@ android_system_image { 
                "libstdc++", // base_system

                "libsysutils", // base_system

                "libui", // base_system

                "libuprobestats_client", // base_system - internal

                "libusbhost", // base_system

                "libutils", // base_system

                "libvintf_jni", // base_system