Replace grep | head | awk | tr | tr with awk.
Head was causing a SIGPIPE in grep that only appeared when using distss. This wasn't causing any build problems but spewed a lot of warnings. However, this change trims the command from 5 proccesses to 1 which is nice. Change-Id: Iac846ec1d01a022976cfc5fd28091a720ab161e7
This commit is contained in:
parent
5cf0b2cf83
commit
fa30f5b8c4
|
@ -201,15 +201,13 @@ $(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_
|
|||
$(create-resource-java-files)
|
||||
$(hide) for GENERATED_MANIFEST_FILE in `find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) \
|
||||
-name Manifest.java 2> /dev/null`; do \
|
||||
dir=`grep package $$GENERATED_MANIFEST_FILE | head -n1 | \
|
||||
awk '{print $$2}' | tr -d ";" | tr . /`; \
|
||||
dir=`awk '/package/{gsub(/\./,"/",$$2);gsub(/;/,"",$$2);print $$2;exit}' $$GENERATED_MANIFEST_FILE`; \
|
||||
mkdir -p $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \
|
||||
$(ACP) -fpt $$GENERATED_MANIFEST_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \
|
||||
done;
|
||||
$(hide) for GENERATED_R_FILE in `find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) \
|
||||
-name R.java 2> /dev/null`; do \
|
||||
dir=`grep package $$GENERATED_R_FILE | head -n1 | \
|
||||
awk '{print $$2}' | tr -d ";" | tr . /`; \
|
||||
dir=`awk '/package/{gsub(/\./,"/",$$2);gsub(/;/,"",$$2);print $$2;exit}' $$GENERATED_R_FILE`; \
|
||||
mkdir -p $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \
|
||||
$(ACP) -fpt $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \
|
||||
|| exit 31; \
|
||||
|
|
Loading…
Reference in New Issue