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

Commit e96be6bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "preinstalled-packages-platform for profiles"

parents ff7c844f 3c1f8dfd

target/product/aosp_product.mk

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

    messaging \

    PhotoTable \

    preinstalled-packages-platform-aosp-product.xml \

    WAPPushManager \

    WallpaperPicker \

target/product/full_base.mk

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ PRODUCT_PACKAGES := \ 


PRODUCT_PACKAGES += \

    LiveWallpapersPicker \

    PhotoTable

    PhotoTable \

    preinstalled-packages-platform-full-base.xml



# Bluetooth:

#   audio.a2dp.default is a system module. Generic system image includes

target/product/handheld_product.mk

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

    Music \

    OneTimeInitializer \

    preinstalled-packages-platform-handheld-product.xml \

    Provision \

    QuickSearchBox \

    Settings \

target/product/sysconfig/Android.bp

0 → 100644
+33 −0
Original line number Diff line number Diff line 
// Copyright (C} 2019 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License"};

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



prebuilt_etc {

    name: "preinstalled-packages-platform-aosp-product.xml",

    product_specific: true,

    sub_dir: "sysconfig",

    src: "preinstalled-packages-platform-aosp-product.xml",

}



prebuilt_etc {

    name: "preinstalled-packages-platform-full-base.xml",

    sub_dir: "sysconfig",

    src: "preinstalled-packages-platform-full-base.xml",

}



prebuilt_etc {

    name: "preinstalled-packages-platform-handheld-product.xml",

    product_specific: true,

    sub_dir: "sysconfig",

    src: "preinstalled-packages-platform-handheld-product.xml",

}
 
 No newline at end of file

target/product/sysconfig/preinstalled-packages-platform-aosp-product.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- System packages to preinstall on all devices with aosp_product, per user type.

     Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml

-->

<config>

    <install-in-user-type package="com.android.wallpaperpicker">

        <install-in user-type="FULL" />

    </install-in-user-type>

</config>