Merge "Move ro.build.characteristics to /product props"
This commit is contained in:
commit
0625f9a524
|
@ -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 $@
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue