3c77151b46
After commit I59cd149e0021211b8fd59c44b93bbf18dc8637bf, init_first_stage is no longer installed to the ramdisk when BOARD_USES_RECOVERY_AS_BOOT is True (see b/190974433 for details and init/Android.mk in that commit). adb_debug.prop, which is needed for boot-debug.img, boot-test-harness.img, etc.,will be absent when BOARD_USES_RECOVERY_AS_BOOT is true, because adb_debug.prop is only required by the init_first_stage. Adding adb_debug.prop into generic_ramdisk.mk to include it unconditionally. Bug: 192432810 Test: flash boot-debug.img on a user build, check `adb root` works Change-Id: I234b3430af1b8b09aeb46aef928ca8e16ad452cc
40 lines
1.3 KiB
Makefile
40 lines
1.3 KiB
Makefile
#
|
|
# Copyright (C) 2020 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 makefile installs contents of the generic ramdisk.
|
|
# Inherit from this makefile to declare that this product uses generic ramdisk.
|
|
# This makefile checks that other makefiles must not install things to the
|
|
# ramdisk.
|
|
|
|
# Ramdisk
|
|
PRODUCT_PACKAGES += \
|
|
init_first_stage \
|
|
|
|
# Debug ramdisk
|
|
PRODUCT_PACKAGES += \
|
|
adb_debug.prop \
|
|
userdebug_plat_sepolicy.cil \
|
|
|
|
_my_paths := \
|
|
$(TARGET_COPY_OUT_RAMDISK)/ \
|
|
$(TARGET_COPY_OUT_DEBUG_RAMDISK)/ \
|
|
system/usr/share/zoneinfo/tz_version \
|
|
system/usr/share/zoneinfo/tzdata \
|
|
|
|
# We use the "relaxed" version here because tzdata / tz_version is only produced
|
|
# by this makefile on a subset of devices.
|
|
# TODO: remove this
|
|
$(call require-artifacts-in-path-relaxed, $(_my_paths), )
|