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

Commit 0bcbebc0 authored by Chan Wang's avatar Chan Wang Committed by Gerrit Code Review
Browse files

Merge "Revert "Adding EXTRA_ALLOWED_DEPS_TXT config for non-mainline deps"" into main

parents 21bb9223 d8956e9c

core/project_definitions.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -22,6 +22,3 @@ 
# Include definitions for prebuilt SDK, if present.

# Include definitions for prebuilt SDK, if present.

#

#

-include prebuilts/sdk/current/definitions.mk
 
-include prebuilts/sdk/current/definitions.mk
 


# SDV-specific config.

-include system/software_defined_vehicle/platform/config.mk

core/soong_config.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -358,8 +358,6 @@ $(call add_json_list, ProductPropFiles, $(TARGET_PRODUCT_PROP)) 
$(call add_json_list, OdmPropFiles, $(TARGET_ODM_PROP))

$(call add_json_list, OdmPropFiles, $(TARGET_ODM_PROP))

$(call add_json_list, VendorPropFiles, $(TARGET_VENDOR_PROP))

$(call add_json_list, VendorPropFiles, $(TARGET_VENDOR_PROP))





$(call add_json_str, ExtraAllowedDepsTxt, $(EXTRA_ALLOWED_DEPS_TXT))



# Do not set ArtTargetIncludeDebugBuild into any value if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD is not set,

# Do not set ArtTargetIncludeDebugBuild into any value if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD is not set,

# to have the same behavior from runtime_libart.mk.

# to have the same behavior from runtime_libart.mk.

ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),)

ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),)