StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Android U (ab/10368041)

Browse Source 
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
This commit is contained in:
Xin Li
2023-08-25 13:25:26 -07:00
parent d3cfff21f4 4a80353011
commit be1435290d
25 changed files with 631 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@@ -912,7 +912,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))
# is made which breaks compatibility with the previous platform sepolicy version, # is made which breaks compatibility with the previous platform sepolicy version,
# not just on every increase in PLATFORM_SDK_VERSION. The minor version should # not just on every increase in PLATFORM_SDK_VERSION. The minor version should
# be reset to 0 on every bump of the PLATFORM_SDK_VERSION. # be reset to 0 on every bump of the PLATFORM_SDK_VERSION.
sepolicy_major_vers := 33 sepolicy_major_vers := 34
sepolicy_minor_vers := 0 sepolicy_minor_vers := 0
ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION)) ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

2
core/generate_enforce_rro.mk
View File

@@ -38,7 +38,7 @@ endif
LOCAL_FULL_MANIFEST_FILE := $(rro_android_manifest_file) LOCAL_FULL_MANIFEST_FILE := $(rro_android_manifest_file)
LOCAL_AAPT_FLAGS += --auto-add-overlay LOCAL_AAPT_FLAGS += --auto-add-overlay --keep-raw-values
LOCAL_RESOURCE_DIR := $(enforce_rro_source_overlays) LOCAL_RESOURCE_DIR := $(enforce_rro_source_overlays)
ifeq (product,$(enforce_rro_partition)) ifeq (product,$(enforce_rro_partition))

89
core/tasks/automotive-general-tests.mk Normal file
View File

@@ -0,0 +1,89 @@
# Copyright (C) 2022 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.
.PHONY: automotive-general-tests
automotive_general_tests_tools := \
$(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \
$(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \
$(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed.jar \
intermediates_dir := $(call intermediates-dir-for,PACKAGING,automotive-general-tests)
automotive_general_tests_zip := $(PRODUCT_OUT)/automotive-general-tests.zip
# Create an artifact to include a list of test config files in automotive-general-tests.
automotive_general_tests_list_zip := $(PRODUCT_OUT)/automotive-general-tests_list.zip
# Filter shared entries between automotive-general-tests and automotive-tests's HOST_SHARED_LIBRARY.FILES,
# to avoid warning about overriding commands.
my_host_shared_lib_for_automotive_general_tests := \
$(foreach m,$(filter $(COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES),\
$(COMPATIBILITY.automotive-general-tests.HOST_SHARED_LIBRARY.FILES)),$(call word-colon,2,$(m)))
my_automotive_general_tests_shared_lib_files := \
$(filter-out $(COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES),\
$(COMPATIBILITY.automotive-general-tests.HOST_SHARED_LIBRARY.FILES))
my_host_shared_lib_for_automotive_general_tests += $(call copy-many-files,$(my_automotive_general_tests_shared_lib_files))
# Create an artifact to include all test config files in automotive-general-tests.
automotive_general_tests_configs_zip := $(PRODUCT_OUT)/automotive-general-tests_configs.zip
# Create an artifact to include all shared librariy files in automotive-general-tests.
automotive_general_tests_host_shared_libs_zip := $(PRODUCT_OUT)/automotive-general-tests_host-shared-libs.zip
$(automotive_general_tests_zip) : PRIVATE_automotive_general_tests_list_zip := $(automotive_general_tests_list_zip)
$(automotive_general_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(automotive_general_tests_list_zip) $(automotive_general_tests_configs_zip) $(automotive_general_tests_host_shared_libs_zip)
$(automotive_general_tests_zip) : PRIVATE_TOOLS := $(automotive_general_tests_tools)
$(automotive_general_tests_zip) : PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir)
$(automotive_general_tests_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_automotive_general_tests)
$(automotive_general_tests_zip) : PRIVATE_automotive_general_tests_configs_zip := $(automotive_general_tests_configs_zip)
$(automotive_general_tests_zip) : PRIVATE_general_host_shared_libs_zip := $(automotive_general_tests_host_shared_libs_zip)
$(automotive_general_tests_zip) : $(COMPATIBILITY.automotive-general-tests.FILES) $(automotive_general_tests_tools) $(my_host_shared_lib_for_automotive_general_tests) $(SOONG_ZIP)
rm -rf $(PRIVATE_INTERMEDIATES_DIR)
rm -f $@ $(PRIVATE_automotive_general_tests_list_zip)
mkdir -p $(PRIVATE_INTERMEDIATES_DIR) $(PRIVATE_INTERMEDIATES_DIR)/tools
echo $(sort $(COMPATIBILITY.automotive-general-tests.FILES)) | tr " " "\n" > $(PRIVATE_INTERMEDIATES_DIR)/list
grep $(HOST_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/host.list || true
grep $(TARGET_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/target.list || true
grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list > $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list || true
grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list > $(PRIVATE_INTERMEDIATES_DIR)/target-test-configs.list || true
$(hide) for shared_lib in $(PRIVATE_HOST_SHARED_LIBS); do \
echo $$shared_lib >> $(PRIVATE_INTERMEDIATES_DIR)/host.list; \
echo $$shared_lib >> $(PRIVATE_INTERMEDIATES_DIR)/shared-libs.list; \
done
grep $(HOST_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/shared-libs.list > $(PRIVATE_INTERMEDIATES_DIR)/host-shared-libs.list || true
cp -fp $(PRIVATE_TOOLS) $(PRIVATE_INTERMEDIATES_DIR)/tools/
$(SOONG_ZIP) -d -o $@ \
-P host -C $(PRIVATE_INTERMEDIATES_DIR) -D $(PRIVATE_INTERMEDIATES_DIR)/tools \
-P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host.list \
-P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target.list
$(SOONG_ZIP) -d -o $(PRIVATE_automotive_general_tests_configs_zip) \
-P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list \
-P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target-test-configs.list
$(SOONG_ZIP) -d -o $(PRIVATE_general_host_shared_libs_zip) \
-P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host-shared-libs.list
grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list
grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list
$(SOONG_ZIP) -d -o $(PRIVATE_automotive_general_tests_list_zip) -C $(PRIVATE_INTERMEDIATES_DIR) -f $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list
automotive-general-tests: $(automotive_general_tests_zip)
$(call dist-for-goals, automotive-general-tests, $(automotive_general_tests_zip) $(automotive_general_tests_list_zip) $(automotive_general_tests_configs_zip) $(automotive_general_tests_host_shared_libs_zip))
$(call declare-1p-container,$(automotive_general_tests_zip),)
$(call declare-container-license-deps,$(automotive_general_tests_zip),$(COMPATIBILITY.automotive-general-tests.FILES) $(automotive_general_tests_tools) $(my_host_shared_lib_for_automotive_general_tests),$(PRODUCT_OUT)/:/)
intermediates_dir :=
automotive_general_tests_tools :=
automotive_general_tests_zip :=
automotive_general_tests_list_zip :=
automotive_general_tests_configs_zip :=
automotive_general_tests_host_shared_libs_zip :=

61
core/tasks/automotive-tests.mk Normal file
View File

@@ -0,0 +1,61 @@
# Copyright (C) 2022 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.
.PHONY: automotive-tests
automotive-tests-zip := $(PRODUCT_OUT)/automotive-tests.zip
# Create an artifact to include a list of test config files in automotive-tests.
automotive-tests-list-zip := $(PRODUCT_OUT)/automotive-tests_list.zip
# Create an artifact to include all test config files in automotive-tests.
automotive-tests-configs-zip := $(PRODUCT_OUT)/automotive-tests_configs.zip
my_host_shared_lib_for_automotive_tests := $(call copy-many-files,$(COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES))
automotive_tests_host_shared_libs_zip := $(PRODUCT_OUT)/automotive-tests_host-shared-libs.zip
$(automotive-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(automotive-tests-list-zip) $(automotive-tests-configs-zip) $(automotive_tests_host_shared_libs_zip)
$(automotive-tests-zip) : PRIVATE_automotive_tests_list := $(PRODUCT_OUT)/automotive-tests_list
$(automotive-tests-zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_automotive_tests)
$(automotive-tests-zip) : PRIVATE_automotive_host_shared_libs_zip := $(automotive_tests_host_shared_libs_zip)
$(automotive-tests-zip) : $(COMPATIBILITY.automotive-tests.FILES) $(my_host_shared_lib_for_automotive_tests) $(SOONG_ZIP)
rm -f $@-shared-libs.list
echo $(sort $(COMPATIBILITY.automotive-tests.FILES)) | tr " " "\n" > $@.list
grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true
grep -e .*\\.config$$ $@-host.list > $@-host-test-configs.list || true
$(hide) for shared_lib in $(PRIVATE_HOST_SHARED_LIBS); do \
echo $$shared_lib >> $@-host.list; \
echo $$shared_lib >> $@-shared-libs.list; \
done
grep $(HOST_OUT_TESTCASES) $@-shared-libs.list > $@-host-shared-libs.list || true
grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true
grep -e .*\\.config$$ $@-target.list > $@-target-test-configs.list || true
$(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list
$(hide) $(SOONG_ZIP) -d -o $(automotive-tests-configs-zip) \
-P host -C $(HOST_OUT) -l $@-host-test-configs.list \
-P target -C $(PRODUCT_OUT) -l $@-target-test-configs.list
$(SOONG_ZIP) -d -o $(PRIVATE_automotive_host_shared_libs_zip) \
-P host -C $(HOST_OUT) -l $@-host-shared-libs.list
rm -f $(PRIVATE_automotive_tests_list)
$(hide) grep -e .*\\.config$$ $@-host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_automotive_tests_list)
$(hide) grep -e .*\\.config$$ $@-target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_automotive_tests_list)
$(hide) $(SOONG_ZIP) -d -o $(automotive-tests-list-zip) -C $(dir $@) -f $(PRIVATE_automotive_tests_list)
rm -f $@.list $@-host.list $@-target.list $@-host-test-configs.list $@-target-test-configs.list \
$@-shared-libs.list $@-host-shared-libs.list $(PRIVATE_automotive_tests_list)
automotive-tests: $(automotive-tests-zip)
$(call dist-for-goals, automotive-tests, $(automotive-tests-zip) $(automotive-tests-list-zip) $(automotive-tests-configs-zip) $(automotive_tests_host_shared_libs_zip))
$(call declare-1p-container,$(automotive-tests-zip),)
$(call declare-container-license-deps,$(automotive-tests-zip),$(COMPATIBILITY.automotive-tests.FILES) $(my_host_shared_lib_for_automotive_tests),$(PRODUCT_OUT)/:/)
tests: automotive-tests

10
core/version_defaults.mk
View File

@@ -47,7 +47,7 @@ MAX_PLATFORM_VERSION := VP1A
# The last stable version name of the platform that was released. During # The last stable version name of the platform that was released. During
# development, this stays at that previous version, while the codename indicates # development, this stays at that previous version, while the codename indicates
# further work based on the previous version. # further work based on the previous version.
PLATFORM_VERSION_LAST_STABLE := 13 PLATFORM_VERSION_LAST_STABLE := 14
.KATI_READONLY := PLATFORM_VERSION_LAST_STABLE .KATI_READONLY := PLATFORM_VERSION_LAST_STABLE
# These are the current development codenames, if the build is not a final # These are the current development codenames, if the build is not a final
@@ -60,7 +60,7 @@ PLATFORM_VERSION_CODENAME.VP1A := VanillaIceCream
# This is the user-visible version. In a final release build it should # This is the user-visible version. In a final release build it should
# be empty to use PLATFORM_VERSION as the user-visible version. For # be empty to use PLATFORM_VERSION as the user-visible version. For
# a preview release it can be set to a user-friendly value like `12 Preview 1` # a preview release it can be set to a user-friendly value like `12 Preview 1`
PLATFORM_DISPLAY_VERSION := 13 PLATFORM_DISPLAY_VERSION :=
ifndef PLATFORM_SDK_VERSION ifndef PLATFORM_SDK_VERSION
# This is the canonical definition of the SDK version, which defines # This is the canonical definition of the SDK version, which defines
@@ -75,12 +75,12 @@ ifndef PLATFORM_SDK_VERSION
# When you increment the PLATFORM_SDK_VERSION please ensure you also # When you increment the PLATFORM_SDK_VERSION please ensure you also
# clear out the following text file of all older PLATFORM_VERSION's: # clear out the following text file of all older PLATFORM_VERSION's:
# cts/tests/tests/os/assets/platform_versions.txt # cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_SDK_VERSION := 33 PLATFORM_SDK_VERSION := 34
endif endif
.KATI_READONLY := PLATFORM_SDK_VERSION .KATI_READONLY := PLATFORM_SDK_VERSION
# This is the sdk extension version of this tree. # This is the sdk extension version of this tree.
PLATFORM_SDK_EXTENSION_VERSION := 3 PLATFORM_SDK_EXTENSION_VERSION := 7
.KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION .KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
# This is the sdk extension version that PLATFORM_SDK_VERSION ships with. # This is the sdk extension version that PLATFORM_SDK_VERSION ships with.
@@ -105,7 +105,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices. # It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2023-06-05 PLATFORM_SECURITY_PATCH := 2023-08-05
endif endif
include $(BUILD_SYSTEM)/version_util.mk include $(BUILD_SYSTEM)/version_util.mk

4
core/version_util.mk
View File

@@ -191,7 +191,7 @@ ifndef PLATFORM_SYSTEMSDK_MIN_VERSION
# to the public SDK where platform essentially supports all previous SDK versions, # to the public SDK where platform essentially supports all previous SDK versions,
# platform supports only a few number of recent system SDK versions as some of # platform supports only a few number of recent system SDK versions as some of
# old system APIs are gradually deprecated, removed and then deleted. # old system APIs are gradually deprecated, removed and then deleted.
PLATFORM_SYSTEMSDK_MIN_VERSION := 28 PLATFORM_SYSTEMSDK_MIN_VERSION := 29
endif endif
.KATI_READONLY := PLATFORM_SYSTEMSDK_MIN_VERSION .KATI_READONLY := PLATFORM_SYSTEMSDK_MIN_VERSION
@@ -261,6 +261,6 @@ ifndef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION
# Used to set minimum supported target sdk version. Apps targeting sdk # Used to set minimum supported target sdk version. Apps targeting sdk
# version lower than the set value will result in a warning being shown # version lower than the set value will result in a warning being shown
# when any activity from the app is started. # when any activity from the app is started.
PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23 PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28
endif endif
.KATI_READONLY := PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION .KATI_READONLY := PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION

1
target/product/aosp_product.mk
View File

@@ -29,6 +29,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
# More AOSP packages # More AOSP packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
initial-package-stopped-states-aosp.xml \
messaging \ messaging \
PhotoTable \ PhotoTable \
preinstalled-packages-platform-aosp-product.xml \ preinstalled-packages-platform-aosp-product.xml \

16
target/product/base_system.mk
View File

@@ -53,8 +53,11 @@ PRODUCT_PACKAGES += \
com.android.adservices \ com.android.adservices \
com.android.appsearch \ com.android.appsearch \
com.android.btservices \ com.android.btservices \
com.android.configinfrastructure \
com.android.conscrypt \ com.android.conscrypt \
com.android.devicelock \
com.android.extservices \ com.android.extservices \
com.android.healthfitness \
com.android.i18n \ com.android.i18n \
com.android.ipsec \ com.android.ipsec \
com.android.location.provider \ com.android.location.provider \
@@ -119,6 +122,7 @@ PRODUCT_PACKAGES += \
incident-helper-cmd \ incident-helper-cmd \
init.environ.rc \ init.environ.rc \
init_system \ init_system \
initial-package-stopped-states.xml \
input \ input \
installd \ installd \
IntentResolver \ IntentResolver \
@@ -237,6 +241,7 @@ PRODUCT_PACKAGES += \
platform.xml \ platform.xml \
pm \ pm \
pppd \ pppd \
preinstalled-packages-asl-files.xml \
preinstalled-packages-platform.xml \ preinstalled-packages-platform.xml \
privapp-permissions-platform.xml \ privapp-permissions-platform.xml \
prng_seeder \ prng_seeder \
@@ -283,7 +288,6 @@ PRODUCT_PACKAGES += \
viewcompiler \ viewcompiler \
voip-common \ voip-common \
vold \ vold \
WallpaperBackup \
watchdogd \ watchdogd \
wificond \ wificond \
wifi.rc \ wifi.rc \
@@ -329,6 +333,11 @@ ifeq ($(EMMA_INSTRUMENT),true)
endif # EMMA_INSTRUMENT_STATIC endif # EMMA_INSTRUMENT_STATIC
endif # EMMA_INSTRUMENT endif # EMMA_INSTRUMENT
ifeq (,$(DISABLE_WALLPAPER_BACKUP))
PRODUCT_PACKAGES += \
WallpaperBackup
endif
# For testing purposes # For testing purposes
ifeq ($(FORCE_AUDIO_SILENT), true) ifeq ($(FORCE_AUDIO_SILENT), true)
PRODUCT_SYSTEM_PROPERTIES += ro.audio.silent=1 PRODUCT_SYSTEM_PROPERTIES += ro.audio.silent=1
@@ -393,6 +402,7 @@ PRODUCT_PACKAGES_DEBUG := \
iotop \ iotop \
iperf3 \ iperf3 \
iw \ iw \
layertracegenerator \
libclang_rt.ubsan_standalone \ libclang_rt.ubsan_standalone \
logpersist.start \ logpersist.start \
logtagd.rc \ logtagd.rc \
@@ -418,7 +428,11 @@ PRODUCT_PACKAGES_DEBUG := \
# The set of packages whose code can be loaded by the system server. # The set of packages whose code can be loaded by the system server.
PRODUCT_SYSTEM_SERVER_APPS += \ PRODUCT_SYSTEM_SERVER_APPS += \
SettingsProvider \ SettingsProvider \
ifeq (,$(DISABLE_WALLPAPER_BACKUP))
PRODUCT_SYSTEM_SERVER_APPS += \
WallpaperBackup WallpaperBackup
endif
PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE := \ PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE := \
libdumpcoverage libdumpcoverage

1
target/product/base_vendor.mk
View File

@@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \
dumpsys_vendor \ dumpsys_vendor \
fs_config_files_nonsystem \ fs_config_files_nonsystem \
fs_config_dirs_nonsystem \ fs_config_dirs_nonsystem \
gpu_counter_producer \
gralloc.default \ gralloc.default \
group_odm \ group_odm \
group_vendor \ group_vendor \

7
target/product/default_art_config.mk
View File

@@ -63,7 +63,10 @@ PRODUCT_APEX_BOOT_JARS := \
com.android.adservices:framework-sdksandbox \ com.android.adservices:framework-sdksandbox \
com.android.appsearch:framework-appsearch \ com.android.appsearch:framework-appsearch \
com.android.btservices:framework-bluetooth \ com.android.btservices:framework-bluetooth \
com.android.configinfrastructure:framework-configinfrastructure \
com.android.conscrypt:conscrypt \ com.android.conscrypt:conscrypt \
com.android.devicelock:framework-devicelock \
com.android.healthfitness:framework-healthfitness \
com.android.i18n:core-icu4j \ com.android.i18n:core-icu4j \
com.android.ipsec:android.net.ipsec.ike \ com.android.ipsec:android.net.ipsec.ike \
com.android.media:updatable-media \ com.android.media:updatable-media \
@@ -89,7 +92,10 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \
com.android.adservices:service-sdksandbox \ com.android.adservices:service-sdksandbox \
com.android.appsearch:service-appsearch \ com.android.appsearch:service-appsearch \
com.android.art:service-art \ com.android.art:service-art \
com.android.configinfrastructure:service-configinfrastructure \
com.android.healthfitness:service-healthfitness \
com.android.media:service-media-s \ com.android.media:service-media-s \
com.android.ondevicepersonalization:service-ondevicepersonalization \
com.android.permission:service-permission \ com.android.permission:service-permission \
com.android.rkpd:service-rkp \ com.android.rkpd:service-rkp \
@@ -108,6 +114,7 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \
# Note: For modules available in Q, DO NOT add new entries here. # Note: For modules available in Q, DO NOT add new entries here.
PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \ PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \
com.android.btservices:service-bluetooth \ com.android.btservices:service-bluetooth \
com.android.devicelock:service-devicelock \
com.android.os.statsd:service-statsd \ com.android.os.statsd:service-statsd \
com.android.scheduling:service-scheduling \ com.android.scheduling:service-scheduling \
com.android.tethering:service-connectivity \ com.android.tethering:service-connectivity \

3
target/product/generic_system.mk
View File

@@ -32,6 +32,7 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
LiveWallpapersPicker \ LiveWallpapersPicker \
PartnerBookmarksProvider \ PartnerBookmarksProvider \
preinstalled-packages-platform-generic-system.xml \
Stk \ Stk \
Tag \ Tag \
@@ -67,7 +68,7 @@ PRODUCT_PACKAGES += \
android.hardware.radio.config@1.0 \ android.hardware.radio.config@1.0 \
android.hardware.radio.deprecated@1.0 \ android.hardware.radio.deprecated@1.0 \
android.hardware.secure_element@1.0 \ android.hardware.secure_element@1.0 \
android.hardware.wifi@1.0 \ android.hardware.wifi \
libaudio-resampler \ libaudio-resampler \
libaudiohal \ libaudiohal \
libdrm \ libdrm \

210
target/product/gsi/34.txt Normal file
View File

@@ -0,0 +1,210 @@
LLNDK: libEGL.so
LLNDK: libGLESv1_CM.so
LLNDK: libGLESv2.so
LLNDK: libGLESv3.so
LLNDK: libRS.so
LLNDK: libandroid_net.so
LLNDK: libbinder_ndk.so
LLNDK: libc.so
LLNDK: libcgrouprc.so
LLNDK: libcom.android.tethering.connectivity_native.so
LLNDK: libdl.so
LLNDK: libft2.so
LLNDK: liblog.so
LLNDK: libm.so
LLNDK: libmediandk.so
LLNDK: libnativewindow.so
LLNDK: libneuralnetworks.so
LLNDK: libselinux.so
LLNDK: libsync.so
LLNDK: libvndksupport.so
LLNDK: libvulkan.so
VNDK-SP: android.hardware.common-V2-ndk.so
VNDK-SP: android.hardware.common.fmq-V1-ndk.so
VNDK-SP: android.hardware.graphics.common-V4-ndk.so
VNDK-SP: android.hardware.graphics.common@1.0.so
VNDK-SP: android.hardware.graphics.common@1.1.so
VNDK-SP: android.hardware.graphics.common@1.2.so
VNDK-SP: android.hardware.graphics.composer3-V1-ndk.so
VNDK-SP: android.hardware.graphics.mapper@2.0.so
VNDK-SP: android.hardware.graphics.mapper@2.1.so
VNDK-SP: android.hardware.graphics.mapper@3.0.so
VNDK-SP: android.hardware.graphics.mapper@4.0.so
VNDK-SP: android.hardware.graphics.allocator-V2-ndk.so
VNDK-SP: android.hardware.renderscript@1.0.so
VNDK-SP: android.hidl.memory.token@1.0.so
VNDK-SP: android.hidl.memory@1.0-impl.so
VNDK-SP: android.hidl.memory@1.0.so
VNDK-SP: android.hidl.safe_union@1.0.so
VNDK-SP: libRSCpuRef.so
VNDK-SP: libRSDriver.so
VNDK-SP: libRS_internal.so
VNDK-SP: libbase.so
VNDK-SP: libbcinfo.so
VNDK-SP: libblas.so
VNDK-SP: libc++.so
VNDK-SP: libcompiler_rt.so
VNDK-SP: libcutils.so
VNDK-SP: libdmabufheap.so
VNDK-SP: libgralloctypes.so
VNDK-SP: libhardware.so
VNDK-SP: libhidlbase.so
VNDK-SP: libhidlmemory.so
VNDK-SP: libion.so
VNDK-SP: libjsoncpp.so
VNDK-SP: liblzma.so
VNDK-SP: libprocessgroup.so
VNDK-SP: libunwindstack.so
VNDK-SP: libutils.so
VNDK-SP: libutilscallstack.so
VNDK-SP: libz.so
VNDK-core: android.frameworks.cameraservice.common-V1-ndk.so
VNDK-core: android.frameworks.cameraservice.device-V1-ndk.so
VNDK-core: android.frameworks.cameraservice.service-V1-ndk.so
VNDK-core: android.hardware.audio.common@2.0.so
VNDK-core: android.hardware.configstore-utils.so
VNDK-core: android.hardware.configstore@1.0.so
VNDK-core: android.hardware.configstore@1.1.so
VNDK-core: android.hardware.confirmationui-support-lib.so
VNDK-core: android.hardware.graphics.allocator@2.0.so
VNDK-core: android.hardware.graphics.allocator@3.0.so
VNDK-core: android.hardware.graphics.allocator@4.0.so
VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
VNDK-core: android.hardware.media.bufferpool@2.0.so
VNDK-core: android.hardware.media.omx@1.0.so
VNDK-core: android.hardware.media@1.0.so
VNDK-core: android.hardware.memtrack-V1-ndk.so
VNDK-core: android.hardware.memtrack@1.0.so
VNDK-core: android.hardware.soundtrigger@2.0-core.so
VNDK-core: android.hardware.soundtrigger@2.0.so
VNDK-core: android.hidl.token@1.0-utils.so
VNDK-core: android.hidl.token@1.0.so
VNDK-core: android.system.suspend-V1-ndk.so
VNDK-core: android.system.suspend@1.0.so
VNDK-core: libaudioroute.so
VNDK-core: libaudioutils.so
VNDK-core: libbinder.so
VNDK-core: libbufferqueueconverter.so
VNDK-core: libcamera_metadata.so
VNDK-core: libcap.so
VNDK-core: libcn-cbor.so
VNDK-core: libcodec2.so
VNDK-core: libcrypto.so
VNDK-core: libcrypto_utils.so
VNDK-core: libcurl.so
VNDK-core: libdiskconfig.so
VNDK-core: libdumpstateutil.so
VNDK-core: libevent.so
VNDK-core: libexif.so
VNDK-core: libexpat.so
VNDK-core: libfmq.so
VNDK-core: libgatekeeper.so
VNDK-core: libgui.so
VNDK-core: libhardware_legacy.so
VNDK-core: libhidlallocatorutils.so
VNDK-core: libjpeg.so
VNDK-core: libldacBT_abr.so
VNDK-core: libldacBT_enc.so
VNDK-core: liblz4.so
VNDK-core: libmedia_helper.so
VNDK-core: libmedia_omx.so
VNDK-core: libmemtrack.so
VNDK-core: libminijail.so
VNDK-core: libmkbootimg_abi_check.so
VNDK-core: libnetutils.so
VNDK-core: libnl.so
VNDK-core: libpcre2.so
VNDK-core: libpiex.so
VNDK-core: libpng.so
VNDK-core: libpower.so
VNDK-core: libprocinfo.so
VNDK-core: libradio_metadata.so
VNDK-core: libspeexresampler.so
VNDK-core: libsqlite.so
VNDK-core: libssl.so
VNDK-core: libstagefright_bufferpool@2.0.so
VNDK-core: libstagefright_bufferqueue_helper.so
VNDK-core: libstagefright_foundation.so
VNDK-core: libstagefright_omx.so
VNDK-core: libstagefright_omx_utils.so
VNDK-core: libstagefright_xmlparser.so
VNDK-core: libsysutils.so
VNDK-core: libtinyalsa.so
VNDK-core: libtinyxml2.so
VNDK-core: libui.so
VNDK-core: libusbhost.so
VNDK-core: libwifi-system-iface.so
VNDK-core: libxml2.so
VNDK-core: libyuv.so
VNDK-core: libziparchive.so
VNDK-private: libblas.so
VNDK-private: libcompiler_rt.so
VNDK-private: libft2.so
VNDK-private: libgui.so
VNDK-product: android.hardware.audio.common@2.0.so
VNDK-product: android.hardware.configstore@1.0.so
VNDK-product: android.hardware.configstore@1.1.so
VNDK-product: android.hardware.graphics.allocator@2.0.so
VNDK-product: android.hardware.graphics.allocator@3.0.so
VNDK-product: android.hardware.graphics.allocator@4.0.so
VNDK-product: android.hardware.graphics.bufferqueue@1.0.so
VNDK-product: android.hardware.graphics.bufferqueue@2.0.so
VNDK-product: android.hardware.graphics.common@1.0.so
VNDK-product: android.hardware.graphics.common@1.1.so
VNDK-product: android.hardware.graphics.common@1.2.so
VNDK-product: android.hardware.graphics.mapper@2.0.so
VNDK-product: android.hardware.graphics.mapper@2.1.so
VNDK-product: android.hardware.graphics.mapper@3.0.so
VNDK-product: android.hardware.graphics.mapper@4.0.so
VNDK-product: android.hardware.media.bufferpool@2.0.so
VNDK-product: android.hardware.media.omx@1.0.so
VNDK-product: android.hardware.media@1.0.so
VNDK-product: android.hardware.memtrack@1.0.so
VNDK-product: android.hardware.renderscript@1.0.so
VNDK-product: android.hardware.soundtrigger@2.0.so
VNDK-product: android.hidl.memory.token@1.0.so
VNDK-product: android.hidl.memory@1.0.so
VNDK-product: android.hidl.safe_union@1.0.so
VNDK-product: android.hidl.token@1.0.so
VNDK-product: android.system.suspend@1.0.so
VNDK-product: libaudioutils.so
VNDK-product: libbase.so
VNDK-product: libc++.so
VNDK-product: libcamera_metadata.so
VNDK-product: libcap.so
VNDK-product: libcompiler_rt.so
VNDK-product: libcrypto.so
VNDK-product: libcurl.so
VNDK-product: libcutils.so
VNDK-product: libevent.so
VNDK-product: libexpat.so
VNDK-product: libfmq.so
VNDK-product: libhidlbase.so
VNDK-product: libhidlmemory.so
VNDK-product: libion.so
VNDK-product: libjpeg.so
VNDK-product: libjsoncpp.so
VNDK-product: libldacBT_abr.so
VNDK-product: libldacBT_enc.so
VNDK-product: liblz4.so
VNDK-product: liblzma.so
VNDK-product: libminijail.so
VNDK-product: libnl.so
VNDK-product: libpcre2.so
VNDK-product: libpiex.so
VNDK-product: libpng.so
VNDK-product: libprocessgroup.so
VNDK-product: libprocinfo.so
VNDK-product: libspeexresampler.so
VNDK-product: libssl.so
VNDK-product: libtinyalsa.so
VNDK-product: libtinyxml2.so
VNDK-product: libunwindstack.so
VNDK-product: libutils.so
VNDK-product: libutilscallstack.so
VNDK-product: libwifi-system-iface.so
VNDK-product: libxml2.so
VNDK-product: libyuv.so
VNDK-product: libz.so
VNDK-product: libziparchive.so

3
target/product/gsi/current.txt
View File

@@ -59,6 +59,9 @@ VNDK-SP: libunwindstack.so
VNDK-SP: libutils.so VNDK-SP: libutils.so
VNDK-SP: libutilscallstack.so VNDK-SP: libutilscallstack.so
VNDK-SP: libz.so VNDK-SP: libz.so
VNDK-core: android.frameworks.cameraservice.common-V1-ndk.so
VNDK-core: android.frameworks.cameraservice.device-V1-ndk.so
VNDK-core: android.frameworks.cameraservice.service-V1-ndk.so
VNDK-core: android.hardware.audio.common@2.0.so VNDK-core: android.hardware.audio.common@2.0.so
VNDK-core: android.hardware.configstore-utils.so VNDK-core: android.hardware.configstore-utils.so
VNDK-core: android.hardware.configstore@1.0.so VNDK-core: android.hardware.configstore@1.0.so

5
target/product/handheld_system.mk
View File

@@ -43,6 +43,7 @@ PRODUCT_PACKAGES += \
CameraExtensionsProxy \ CameraExtensionsProxy \
CaptivePortalLogin \ CaptivePortalLogin \
CertInstaller \ CertInstaller \
CredentialManager \
DocumentsUI \ DocumentsUI \
DownloadProviderUi \ DownloadProviderUi \
EasterEgg \ EasterEgg \
@@ -57,6 +58,7 @@ PRODUCT_PACKAGES += \
MusicFX \ MusicFX \
NfcNci \ NfcNci \
PacProcessor \ PacProcessor \
preinstalled-packages-platform-handheld-system.xml \
PrintRecommendationService \ PrintRecommendationService \
PrintSpooler \ PrintSpooler \
ProxyHandler \ ProxyHandler \
@@ -80,7 +82,8 @@ PRODUCT_SYSTEM_SERVER_APPS += \
Telecom \ Telecom \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf frameworks/av/media/libeffects/data/audio_effects.xml:system/etc/audio_effects.xml \
frameworks/native/data/etc/android.software.window_magnification.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.window_magnification.xml \
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.carrier?=unknown \ ro.carrier?=unknown \

1
target/product/handheld_system_ext.mk
View File

@@ -22,6 +22,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
# /system_ext packages # /system_ext packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
AccessibilityMenu \
Launcher3QuickStep \ Launcher3QuickStep \
Provision \ Provision \
Settings \ Settings \

3
target/product/runtime_libart.mk
View File

@@ -175,3 +175,6 @@ ifeq (false,$(ART_MODULE_BUILD_FROM_SOURCE))
system/framework/%.odex \ system/framework/%.odex \
system/framework/%.vdex system/framework/%.vdex
endif endif
PRODUCT_SYSTEM_PROPERTIES += \
dalvik.vm.useartservice=true

26
target/product/sysconfig/Android.bp
View File

@@ -29,9 +29,35 @@ prebuilt_etc {
src: "preinstalled-packages-platform-full-base.xml", src: "preinstalled-packages-platform-full-base.xml",
} }
prebuilt_etc {
name: "preinstalled-packages-platform-generic-system.xml",
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-generic-system.xml",
}
prebuilt_etc { prebuilt_etc {
name: "preinstalled-packages-platform-handheld-product.xml", name: "preinstalled-packages-platform-handheld-product.xml",
product_specific: true, product_specific: true,
sub_dir: "sysconfig", sub_dir: "sysconfig",
src: "preinstalled-packages-platform-handheld-product.xml", src: "preinstalled-packages-platform-handheld-product.xml",
} }
prebuilt_etc {
name: "preinstalled-packages-platform-handheld-system.xml",
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-handheld-system.xml",
}
prebuilt_etc {
name: "preinstalled-packages-platform-telephony-product.xml",
product_specific: true,
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-telephony-product.xml",
}
prebuilt_etc {
name: "initial-package-stopped-states-aosp.xml",
product_specific: true,
sub_dir: "sysconfig",
src: "initial-package-stopped-states-aosp.xml",
}

47
target/product/sysconfig/initial-package-stopped-states-aosp.xml Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<!--
This XML defines an allowlist for packages that should not be scanned in a "stopped" state.
When this feature is turned on (indicated by the config config_stopSystemPackagesByDefault in
core/res/res/values/config.xml) packages on the system partition that are encountered by
the PackageManagerService for the first time are scanned in the "stopped" state. This allowlist
is also considered while creating new users on the device. Stopped state is not set during
subsequent reboots.
Example usage
1. <initial-package-state package="com.example.app" stopped="false"/>
Indicates that a system package - com.example.app's initial stopped state should not be set
by the Package Manager. By default, system apps are marked as stopped.
2. <initial-package-state package="com.example.app" stopped="true"/>
Indicates that a system package - com.example.app's initial state should be set by the
Package Manager to "stopped=true". It will have the same effect on the
package's stopped state even if this package was not included in the allow list.
3. <initial-package-state package="com.example.app"/>
Invalid usage.
-->
<config>
<initial-package-state package="com.android.calendar" stopped="false"/>
<initial-package-state package="com.android.camera2" stopped="false"/>
<initial-package-state package="com.android.contacts" stopped="false"/>
<initial-package-state package="com.android.documentsui" stopped="false"/>
<initial-package-state package="com.android.messaging" stopped="false"/>
<initial-package-state package="com.android.quicksearchbox" stopped="false"/>
<initial-package-state package="com.android.settings" stopped="false"/>
<initial-package-state package="com.android.stk" stopped="false"/>
</config>

8
target/product/sysconfig/preinstalled-packages-platform-aosp-product.xml
View File

@@ -20,4 +20,12 @@
<install-in-user-type package="com.android.wallpaperpicker"> <install-in-user-type package="com.android.wallpaperpicker">
<install-in user-type="FULL" /> <install-in user-type="FULL" />
</install-in-user-type> </install-in-user-type>
<!-- System packages that should not be pre-installed on the CLONE profile. -->
<!-- Messages -->
<install-in-user-type package="com.android.messaging">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config> </config>

29
target/product/sysconfig/preinstalled-packages-platform-generic-system.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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 generic_system, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<!-- Stk (SIM ToolKit)
TODO(b/258055479): Check if this should be preinstalled on SYSTEM user -->
<install-in-user-type package="com.android.stk">
<install-in user-type="SYSTEM" />
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config>

50
target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml
View File

@@ -17,6 +17,56 @@
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
--> -->
<config> <config>
<!-- Android Keyboard (AOSP) (LatinIME) TODO(b/258055479) -->
<install-in-user-type package="com.android.inputmethod.latin">
<install-in user-type="SYSTEM" />
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<!-- Calendar -->
<install-in-user-type package="com.android.calendar">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Camera (Camera2) -->
<install-in-user-type package="com.android.camera2">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Clock (DeskClock) -->
<install-in-user-type package="com.android.deskclock">
<install-in user-type="FULL" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Contacts -->
<install-in-user-type package="com.android.contacts">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Gallery (Gallery2) -->
<install-in-user-type package="com.android.gallery3d">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Search (QuickSearchBox) TODO(b/258055479) -->
<install-in-user-type package="com.android.quicksearchbox">
<install-in user-type="SYSTEM" />
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- WallpaperCropper -->
<install-in-user-type package="com.android.wallpapercropper"> <install-in-user-type package="com.android.wallpapercropper">
<install-in user-type="FULL" /> <install-in user-type="FULL" />
</install-in-user-type> </install-in-user-type>

34
target/product/sysconfig/preinstalled-packages-platform-handheld-system.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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 handheld_system, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<!-- Files (DocumentsUI) TODO(b/258055479) -->
<install-in-user-type package="com.android.documentsui">
<install-in user-type="SYSTEM" />
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Printer (BuiltInPrintService) (Does not show on launcher but shows on the share sheet) -->
<install-in-user-type package="com.android.bips">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config>

29
target/product/sysconfig/preinstalled-packages-platform-telephony-product.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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 telephony_product, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<!-- Phone
TODO(b/258055373): Check if this should be preinstalled on SYSTEM user -->
<install-in-user-type package="com.android.dialer">
<install-in user-type="SYSTEM" />
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config>

1
target/product/telephony_product.mk
View File

@@ -21,3 +21,4 @@
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
Dialer \ Dialer \
ImsServiceEntitlement \ ImsServiceEntitlement \
preinstalled-packages-platform-telephony-product.xml

27
tools/generate_gts_shared_report.py
View File

@@ -18,14 +18,12 @@ Checks and generates a report for gts modules that should be open-sourced.
Usage: Usage:
generate_gts_open_source_report.py generate_gts_open_source_report.py
--gtsv-metalic [gts-verifier meta_lic]
--gts-test-metalic [android-gts meta_lic] --gts-test-metalic [android-gts meta_lic]
--checkshare [COMPLIANCE_CHECKSHARE] --checkshare [COMPLIANCE_CHECKSHARE]
--gts-test-dir [directory of android-gts] --gts-test-dir [directory of android-gts]
--output [output file] --output [output file]
Output example: Output example:
GTS-Verifier: PASS/FAIL
GTS-Modules: PASS/FAIL GTS-Modules: PASS/FAIL
GtsIncrementalInstallTestCases_BackgroundProcess GtsIncrementalInstallTestCases_BackgroundProcess
GtsUnsignedNetworkStackTestCases GtsUnsignedNetworkStackTestCases
@@ -38,9 +36,6 @@ import re
def _get_args(): def _get_args():
"""Parses input arguments.""" """Parses input arguments."""
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument(
'--gtsv-metalic', required=True,
help='license meta_lic file path of gts-verifier.zip')
parser.add_argument( parser.add_argument(
'--gts-test-metalic', required=True, '--gts-test-metalic', required=True,
help='license meta_lic file path of android-gts.zip') help='license meta_lic file path of android-gts.zip')
@@ -55,23 +50,6 @@ def _get_args():
help='file path of the output report') help='file path of the output report')
return parser.parse_args() return parser.parse_args()
def _check_gtsv(checkshare: str, gtsv_metalic: str) -> str:
"""Checks gts-verifier license.
Args:
checkshare: path of the COMPLIANCE_CHECKSHARE tool
gtsv_metalic: license meta_lic file path of gts-verifier.zip
Returns:
PASS when gts-verifier.zip doesn't need to be shared, and FAIL
when gts-verifier.zip need to be shared.
"""
cmd = f'{checkshare} {gtsv_metalic}'
proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
proc.communicate()
return 'PASS' if proc.returncode == 0 else 'FAIL'
def _check_gts_test(checkshare: str, gts_test_metalic: str, def _check_gts_test(checkshare: str, gts_test_metalic: str,
gts_test_dir: str) -> tuple[str, set[str]]: gts_test_dir: str) -> tuple[str, set[str]]:
"""Checks android-gts license. """Checks android-gts license.
@@ -109,15 +87,12 @@ def _check_gts_test(checkshare: str, gts_test_metalic: str,
def main(argv): def main(argv):
args = _get_args() args = _get_args()
gtsv_metalic = args.gtsv_metalic
gts_test_metalic = args.gts_test_metalic gts_test_metalic = args.gts_test_metalic
output_file = args.output output_file = args.output
checkshare = args.checkshare checkshare = args.checkshare
gts_test_dir = args.gts_test_dir gts_test_dir = args.gts_test_dir
with open(output_file, 'w') as file: with open(output_file, 'w') as file:
result = _check_gtsv(checkshare, gtsv_metalic)
file.write(f'GTS-Verifier: {result}\n')
result, open_source_modules = _check_gts_test( result, open_source_modules = _check_gts_test(
checkshare, gts_test_metalic, gts_test_dir) checkshare, gts_test_metalic, gts_test_dir)
file.write(f'GTS-Modules: {result}\n') file.write(f'GTS-Modules: {result}\n')
@@ -125,4 +100,4 @@ def main(argv):
file.write(f'\t{open_source_module}\n') file.write(f'\t{open_source_module}\n')
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv) main(sys.argv)