Merge "Adding Cuttlefish Core Owners" into main
diff --git a/guest/hals/gralloc/Android.bp b/guest/hals/gralloc/Android.bp
deleted file mode 100644
index eb58bae..0000000
--- a/guest/hals/gralloc/Android.bp
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (C) 2024 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.
-
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-soong_config_module_type {
- name: "cf_apex",
- module_type: "apex",
- config_namespace: "cvd",
- bool_variables: [
- "RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL",
- ],
- properties: [
- "defaults",
- ],
-}
-
-cf_apex {
- name: "com.google.cf.gralloc",
- manifest: "apex_manifest.json",
- key: "com.google.cf.apex.key",
- certificate: ":com.google.cf.apex.certificate",
- file_contexts: "apex_file_contexts",
- updatable: false,
- vendor: true,
-
- binaries: [
- "android.hardware.graphics.allocator-service.minigbm",
- ],
- prebuilts: [
- "allocator.minigbm.xml", // vintf
- "com.google.cf.gralloc.rc", // init_rc
- ],
- overrides: [
- "android.hardware.graphics.allocator-service.minigbm",
- ],
-
- soong_config_variables: {
- RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL: {
- defaults: [
- "com.google.cf.gralloc-mapper-defaults",
- ],
- },
- },
-}
-
-apex_defaults {
- name: "com.google.cf.gralloc-mapper-defaults",
-
- // for app_process32 apps
- compile_multilib: "both",
-
- native_shared_libs: [
- "mapper.minigbm",
- ],
- prebuilts: [
- "com.google.cf.gralloc-linker-config", // make the apex namespace visible for mapper library
- "mapper.minigbm.xml", // vintf
- ],
- overrides: [
- "mapper.minigbm",
- ],
-}
-
-linker_config {
- name: "com.google.cf.gralloc-linker-config",
- src: "apex_linkerconfig.json",
- installable: false,
-}
-
-genrule {
- name: "gen-com.google.cf.gralloc.rc",
- srcs: [":allocator.minigbm.rc"],
- out: ["com.google.cf.gralloc.rc"],
- cmd: "sed -E 's%/vendor/bin/%/apex/com.google.cf.gralloc/bin/%' $(in) > $(out)",
-}
-
-prebuilt_etc {
- name: "com.google.cf.gralloc.rc",
- src: ":gen-com.google.cf.gralloc.rc",
- installable: false,
-}
diff --git a/guest/hals/gralloc/apex_file_contexts b/guest/hals/gralloc/apex_file_contexts
deleted file mode 100644
index 7f1ded8..0000000
--- a/guest/hals/gralloc/apex_file_contexts
+++ /dev/null
@@ -1,5 +0,0 @@
-(/.*)? u:object_r:vendor_file:s0
-/etc(/.*)? u:object_r:vendor_configs_file:s0
-/etc/linker.config.pb u:object_r:linkerconfig_file:s0
-/lib(64)?(/.*)? u:object_r:same_process_hal_file:s0
-/bin/hw/android\.hardware\.graphics\.allocator-service\.minigbm u:object_r:hal_graphics_allocator_default_exec:s0
\ No newline at end of file
diff --git a/guest/hals/gralloc/apex_linkerconfig.json b/guest/hals/gralloc/apex_linkerconfig.json
deleted file mode 100644
index c858ae5..0000000
--- a/guest/hals/gralloc/apex_linkerconfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- // visible so that mapper can be loaded from the apex
- "visible": true
-}
\ No newline at end of file
diff --git a/guest/hals/gralloc/apex_manifest.json b/guest/hals/gralloc/apex_manifest.json
deleted file mode 100644
index aaa1d88..0000000
--- a/guest/hals/gralloc/apex_manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "name": "com.google.cf.gralloc",
- "version": 1
-}
\ No newline at end of file
diff --git a/shared/graphics/device_vendor.mk b/shared/graphics/device_vendor.mk
index 0bd21ad..4fb90a0 100644
--- a/shared/graphics/device_vendor.mk
+++ b/shared/graphics/device_vendor.mk
@@ -58,9 +58,6 @@
ro.vendor.hwcomposer.pmem=/dev/block/pmem1
# Gralloc implementation
-$(call soong_config_set,cvd,RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL,$(RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL))
-PRODUCT_PACKAGES += com.google.cf.gralloc
-
PRODUCT_PACKAGES += \
android.hardware.graphics.allocator-service.minigbm \
android.hardware.graphics.mapper@4.0-impl.minigbm \
diff --git a/vsoc_riscv64/phone/aosp_cf.mk b/vsoc_riscv64/phone/aosp_cf.mk
index 70458dd..2f2655e 100644
--- a/vsoc_riscv64/phone/aosp_cf.mk
+++ b/vsoc_riscv64/phone/aosp_cf.mk
@@ -59,12 +59,6 @@
PRODUCT_SYSTEM_PROPERTIES += \
config.disable_renderscript=1 \
-# TODO(b/271573990): This property can be removed when ART support for JIT on
-# this architecture is available. This is an override as the original property
-# is defined in runtime_libart.mk.
-PRODUCT_PROPERTY_OVERRIDES += \
- dalvik.vm.usejit=false
-
PRODUCT_NAME := aosp_cf_riscv64_phone
PRODUCT_DEVICE := vsoc_riscv64
PRODUCT_MANUFACTURER := Google
diff --git a/vsoc_riscv64/slim/aosp_cf.mk b/vsoc_riscv64/slim/aosp_cf.mk
index b85b738..d3fc2a0 100644
--- a/vsoc_riscv64/slim/aosp_cf.mk
+++ b/vsoc_riscv64/slim/aosp_cf.mk
@@ -57,12 +57,6 @@
PRODUCT_SYSTEM_PROPERTIES += \
config.disable_renderscript=1 \
-# TODO(b/271573990): This property can be removed when ART support for JIT on
-# this architecture is available. This is an override as the original property
-# is defined in runtime_libart.mk.
-PRODUCT_PROPERTY_OVERRIDES += \
- dalvik.vm.usejit=false
-
PRODUCT_NAME := aosp_cf_riscv64_slim
PRODUCT_DEVICE := vsoc_riscv64
PRODUCT_MANUFACTURER := Google
diff --git a/vsoc_riscv64/wear/aosp_cf.mk b/vsoc_riscv64/wear/aosp_cf.mk
index aa44c7f..959ba43 100644
--- a/vsoc_riscv64/wear/aosp_cf.mk
+++ b/vsoc_riscv64/wear/aosp_cf.mk
@@ -70,12 +70,6 @@
PRODUCT_SYSTEM_PROPERTIES += \
config.disable_renderscript=1 \
-# TODO(b/271573990): This property can be removed when ART support for JIT on
-# this architecture is available. This is an override as the original property
-# is defined in runtime_libart.mk.
-PRODUCT_PROPERTY_OVERRIDES += \
- dalvik.vm.usejit=false
-
PRODUCT_NAME := aosp_cf_riscv64_wear
PRODUCT_DEVICE := vsoc_riscv64
PRODUCT_MANUFACTURER := Google
