diff options
| author | Felipe Leme <felipeal@google.com> | 2023-02-28 19:25:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-02-28 19:25:04 +0000 |
| commit | f0e82298938e92351f76aa0560e6ed8b859dee2d (patch) | |
| tree | 449b6c67378ec365490a22f2fe2bf66c192b0327 | |
| parent | a62e9d5e37d62d932e107fc44e369c67c62f3714 (diff) | |
| parent | 99ee49e1e2a18c6e0d6f50a51a68222fdd1133ff (diff) | |
| download | cuttlefish-android13-qpr3-c-s11-release.tar.gz | |
Merge "New HSUM (Headless System User Mode) build for cf phone" into tm-qpr-devandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-release
| -rw-r--r-- | AndroidProducts.mk | 2 | ||||
| -rw-r--r-- | vsoc_x86_64/phone/OWNERS | 1 | ||||
| -rw-r--r-- | vsoc_x86_64_only/phone/aosp_cf_hsum.mk | 28 |
3 files changed, 31 insertions, 0 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index d34531668..d990da100 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -28,6 +28,7 @@ PRODUCT_MAKEFILES := \ aosp_cf_x86_64_tv:$(LOCAL_DIR)/vsoc_x86_64/tv/aosp_cf.mk \ aosp_cf_x86_64_foldable:$(LOCAL_DIR)/vsoc_x86_64/phone/aosp_cf_foldable.mk \ aosp_cf_x86_64_only_phone:$(LOCAL_DIR)/vsoc_x86_64_only/phone/aosp_cf.mk \ + aosp_cf_x86_64_only_phone_hsum:$(LOCAL_DIR)/vsoc_x86_64_only/phone/aosp_cf_hsum.mk \ aosp_cf_x86_64_slim:$(LOCAL_DIR)/vsoc_x86_64_only/slim/aosp_cf.mk \ aosp_cf_x86_auto:$(LOCAL_DIR)/vsoc_x86/auto/aosp_cf.mk \ aosp_cf_x86_pasan:$(LOCAL_DIR)/vsoc_x86/pasan/aosp_cf.mk \ @@ -40,6 +41,7 @@ PRODUCT_MAKEFILES := \ COMMON_LUNCH_CHOICES := \ aosp_cf_arm64_auto-userdebug \ aosp_cf_arm64_phone-userdebug \ + aosp_cf_x86_64_only_phone_hsum-userdebug \ aosp_cf_x86_64_pc-userdebug \ aosp_cf_x86_64_phone-userdebug \ aosp_cf_x86_64_foldable-userdebug \ diff --git a/vsoc_x86_64/phone/OWNERS b/vsoc_x86_64/phone/OWNERS new file mode 100644 index 000000000..e0d597ba7 --- /dev/null +++ b/vsoc_x86_64/phone/OWNERS @@ -0,0 +1 @@ +per-file *hsum*.mk = file:platform/frameworks/base:/MULTIUSER_OWNERS diff --git a/vsoc_x86_64_only/phone/aosp_cf_hsum.mk b/vsoc_x86_64_only/phone/aosp_cf_hsum.mk new file mode 100644 index 000000000..3abca8c0c --- /dev/null +++ b/vsoc_x86_64_only/phone/aosp_cf_hsum.mk @@ -0,0 +1,28 @@ +# +# 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. +# + +# Inherit mostly from aosp_cf_x86_64_phone +$(call inherit-product, device/google/cuttlefish/vsoc_x86_64_only/phone/aosp_cf.mk) +PRODUCT_NAME := aosp_cf_x86_64_only_phone_hsum +PRODUCT_MODEL := Cuttlefish x86_64 phone 64-bit only Headless System User Mode + +# Set Headless System User Mode +PRODUCT_SYSTEM_DEFAULT_PROPERTIES = \ + ro.fw.mu.headless_system_user=true + +# TODO(b/204071542): add package allow-list; something like +# PRODUCT_COPY_FILES += \ +# device/google/cuttlefish/SOME_PATH/preinstalled-packages.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-cf_phone.xml |