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

Commit 232bd340 authored by Ivan Podogov's avatar Ivan Podogov Committed by android-build-merger
Browse files

Merge "Add vendor properties blacklist" am: 2e2290cf am: 869d4e58 

am: 0cf73852

Change-Id: Ia560779c8d7c66d0f886b1e29d8e281d4beba55b
parents 8dba7bcd 0cf73852

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -429,8 +429,8 @@ ifdef property_overrides_split_enabled 
	        echo "#" >> $@;

	$(hide) $(foreach line,$(FINAL_VENDOR_BUILD_PROPERTIES), \

		echo "$(line)" >> $@;)

	$(hide) build/make/tools/post_process_props.py $@

endif  # property_overrides_split_enabled

	$(hide) build/make/tools/post_process_props.py $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_PROPERTY_BLACKLIST)



# -----------------------------------------------------------------

# product build.prop

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ _product_var_list := \ 
    PRODUCT_OEM_PROPERTIES \

    PRODUCT_SYSTEM_DEFAULT_PROPERTIES \

    PRODUCT_SYSTEM_PROPERTY_BLACKLIST \

    PRODUCT_VENDOR_PROPERTY_BLACKLIST \

    PRODUCT_SYSTEM_SERVER_APPS \

    PRODUCT_SYSTEM_SERVER_JARS \

    PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK \