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

Commit b09797a0 authored by Jeongik Cha's avatar Jeongik Cha Committed by android-build-merger
Browse files

Merge changes from topic "apps_to_system_ext" 

am: 046d9393

Change-Id: Ie83ca6f8d5696cf5bc0f682cdc90b5e3ea03cedc
parents c3ca90d7 046d9393

data/etc/Android.bp

+7 −7
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ prebuilt_etc { 


prebuilt_etc {

    name: "privapp_whitelist_com.android.carrierconfig",

    product_specific: true,

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "com.android.carrierconfig.xml",

    filename_from_src: true,
@@ -67,7 +67,7 @@ prebuilt_etc { 


prebuilt_etc {

    name: "privapp_whitelist_com.android.emergency",

    product_specific: true,

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "com.android.emergency.xml",

    filename_from_src: true,
@@ -82,7 +82,7 @@ prebuilt_etc { 


prebuilt_etc {

    name: "privapp_whitelist_com.android.launcher3",

    product_specific: true,

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "com.android.launcher3.xml",

    filename_from_src: true,
@@ -90,7 +90,7 @@ prebuilt_etc { 


prebuilt_etc {

    name: "privapp_whitelist_com.android.provision",

    product_specific: true,

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "com.android.provision.xml",

    filename_from_src: true,
@@ -98,7 +98,7 @@ prebuilt_etc { 


prebuilt_etc {

    name: "privapp_whitelist_com.android.settings",

    product_specific: true,

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "com.android.settings.xml",

    filename_from_src: true,
@@ -114,7 +114,7 @@ prebuilt_etc { 


prebuilt_etc {

    name: "privapp_whitelist_com.android.storagemanager",

    product_specific: true,

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "com.android.storagemanager.xml",

    filename_from_src: true,
@@ -122,7 +122,7 @@ prebuilt_etc { 


prebuilt_etc {

    name: "privapp_whitelist_com.android.systemui",

    product_specific: true,

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "com.android.systemui.xml",

    filename_from_src: true,

data/etc/CleanSpec.mk

0 → 100644
+60 −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.

#



# If you don't need to do a full clean build but would like to touch

# a file or delete some intermediate files, add a clean step to the end

# of the list.  These steps will only be run once, if they haven't been

# run before.

#

# E.g.:

#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)

#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)

#

# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with

# files that are missing or have been moved.

#

# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.

# Use $(OUT_DIR) to refer to the "out" directory.

#

# If you need to re-do something that's already mentioned, just copy

# the command and add it to the bottom of the list.  E.g., if a change

# that you made last week required touching a file and a change you

# made today requires touching the same file, just copy the old

# touch step and add it to the end of the list.

#

# *****************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THE BANNER

# *****************************************************************



# For example:

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)

#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.carrierconfig.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.carrierconfig.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.emergency.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.emergency.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.provision.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.provision.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.settings.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.settings.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.launcher3.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.launcher3.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.systemui.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.systemui.xml)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

data/etc/car/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -126,5 +126,5 @@ prebuilt_etc { 
    sub_dir: "permissions",

    src: "com.android.car.developeroptions.xml",

    filename_from_src: true,

    product_specific: true,

    system_ext_specific: true,

}

data/etc/car/CleanSpec.mk

0 → 100644
+50 −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.

#



# If you don't need to do a full clean build but would like to touch

# a file or delete some intermediate files, add a clean step to the end

# of the list.  These steps will only be run once, if they haven't been

# run before.

#

# E.g.:

#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)

#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)

#

# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with

# files that are missing or have been moved.

#

# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.

# Use $(OUT_DIR) to refer to the "out" directory.

#

# If you need to re-do something that's already mentioned, just copy

# the command and add it to the bottom of the list.  E.g., if a change

# that you made last week required touching a file and a change you

# made today requires touching the same file, just copy the old

# touch step and add it to the end of the list.

#

# *****************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THE BANNER

# *****************************************************************



# For example:

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)

#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.car.developeroptions.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.car.developeroptions.xml)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

packages/CarSystemUI/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ android_app { 
    ],



    platform_apis: true,

    product_specific: true,

    system_ext_specific: true,

    certificate: "platform",

    privileged: true,