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

Commit 0625f9a5 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Move ro.build.characteristics to /product props"

parents 5e7b9937 5ac408ba

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ endif 
			TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \

			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \

			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

	        bash $(BUILDINFO_SH) >> $@

	$(hide) $(foreach file,$(system_prop_file), \

		if [ -f "$(file)" ]; then \
@@ -496,7 +495,8 @@ ifdef BOARD_USES_PRODUCTIMAGE 
endif  # BOARD_USES_PRODUCTIMAGE

	$(hide) echo "#" >> $@; \

	        echo "# ADDITIONAL PRODUCT PROPERTIES" >> $@; \

	        echo "#" >> $@;

	        echo "#" >> $@; \

          echo "ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)" >> $@;

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

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

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

tools/buildinfo.sh

+0 −1
Original line number Diff line number Diff line
@@ -59,6 +59,5 @@ echo "ro.build.fingerprint=$BUILD_FINGERPRINT" 
if [ -n "$BUILD_THUMBPRINT" ] ; then

  echo "ro.build.thumbprint=$BUILD_THUMBPRINT"

fi

echo "ro.build.characteristics=$TARGET_AAPT_CHARACTERISTICS"



echo "# end build properties"