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

Commit 4818f748 authored by Inseob Kim's avatar Inseob Kim Committed by Bowgo Tsai
Browse files

Re-land removing RECOVERY_AS_BOOT check for init_first_stage 

This has kept adb_debug.prop from being installed for
legacy devices with BOARD_USES_RECOVERY_AS_BOOT set to
true.

Bug: 192432810
Bug: 193291885
Test: `lunch aosp_flame-userdebug` and checks `get_build_var
      BOARD_USES_RECOVERY_AS_BOOT` is true.
Test: `make bootimage_debug` then checks
      $OUT/debug_ramdisk/adb_debug.prop exists
Test: build/soong/build_test.bash --dist --incremental

Change-Id: I28e2c082512791407167b610843f18731ed6d673
parent 1f92dc1a

init/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ soong_config_module_type { 
    name: "init_first_stage_cc_defaults",

    module_type: "cc_defaults",

    config_namespace: "ANDROID",

    bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE", "BOARD_USES_RECOVERY_AS_BOOT"],

    bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE"],

    properties: ["installable"],

}
@@ -269,9 +269,6 @@ init_first_stage_cc_defaults { 
        BOARD_BUILD_SYSTEM_ROOT_IMAGE: {

            installable: false,

        },

        BOARD_USES_RECOVERY_AS_BOOT: {

            installable: false,

        },

    },

}

init/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -9,10 +9,8 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE

ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_REQUIRED_MODULES := \

   init_first_stage \



endif  # BOARD_USES_RECOVERY_AS_BOOT

endif  # BOARD_BUILD_SYSTEM_ROOT_IMAGE

include $(BUILD_PHONY_PACKAGE)