LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gn2bp: Fix version script character escaping

Browse Source 
* It seems that an apostrophe is required for the command to be executed successfully

Test: update_results.sh && m cronet_aml_components_cronet_android_cronet
Change-Id: Ide44e8be9d7db6894cb5bf1bcf0c3e4d67c2a228
This commit is contained in:
Mohannad Farrag
2022-12-02 18:01:48 +00:00
committed by Motomu Utsumi
parent 2217cd03f4
commit 25697348e8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/gn2bp/Android.bp.swp
View File

@@ -7841,7 +7841,7 @@ java_genrule {
"-f " + "-f " +
"$(location build/util/LASTCHANGE) " + "$(location build/util/LASTCHANGE) " +
"-e " + "-e " +
"API_LEVEL=20 " + "'API_LEVEL=20' " +
"-o " + "-o " +
"$(out) " + "$(out) " +
"$(location components/cronet/android/java/src/org/chromium/net/impl/ImplVersion.template)", "$(location components/cronet/android/java/src/org/chromium/net/impl/ImplVersion.template)",
@@ -7882,7 +7882,7 @@ java_genrule {
"-f " + "-f " +
"$(location build/util/LASTCHANGE) " + "$(location build/util/LASTCHANGE) " +
"-e " + "-e " +
"API_LEVEL=20 " + "'API_LEVEL=20' " +
"-o " + "-o " +
"$(out) " + "$(out) " +
"$(location components/cronet/android/api/src/org/chromium/net/ApiVersion.template)", "$(location components/cronet/android/api/src/org/chromium/net/ApiVersion.template)",
@@ -8261,7 +8261,7 @@ cc_genrule {
cmd: "$(location build/util/version.py) -f " + cmd: "$(location build/util/version.py) -f " +
"$(location chrome/VERSION) " + "$(location chrome/VERSION) " +
"-e " + "-e " +
"VERSION_FULL=\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH) " + "'VERSION_FULL=\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH)' " +
"-o " + "-o " +
"$(out) " + "$(out) " +
"$(location components/cronet/version.h.in)", "$(location components/cronet/version.h.in)",
@@ -8286,7 +8286,7 @@ cc_genrule {
cmd: "$(location build/util/version.py) -f " + cmd: "$(location build/util/version.py) -f " +
"$(location chrome/VERSION) " + "$(location chrome/VERSION) " +
"-e " + "-e " +
"VERSION_FULL=\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH) " + "'VERSION_FULL=\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH)' " +
"-o " + "-o " +
"$(out) " + "$(out) " +
"$(location components/cronet/version.h.in)", "$(location components/cronet/version.h.in)",
@@ -8311,7 +8311,7 @@ cc_genrule {
cmd: "$(location build/util/version.py) -f " + cmd: "$(location build/util/version.py) -f " +
"$(location chrome/VERSION) " + "$(location chrome/VERSION) " +
"-e " + "-e " +
"VERSION_FULL=\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH) " + "'VERSION_FULL=\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH)' " +
"-o " + "-o " +
"$(out) " + "$(out) " +
"$(location components/cronet/version.h.in)", "$(location components/cronet/version.h.in)",
@@ -8336,7 +8336,7 @@ cc_genrule {
cmd: "$(location build/util/version.py) -f " + cmd: "$(location build/util/version.py) -f " +
"$(location chrome/VERSION) " + "$(location chrome/VERSION) " +
"-e " + "-e " +
"VERSION_FULL=\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH) " + "'VERSION_FULL=\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH)' " +
"-o " + "-o " +
"$(out) " + "$(out) " +
"$(location components/cronet/version.h.in)", "$(location components/cronet/version.h.in)",

1
tools/gn2bp/gen_android_bp
View File

@@ -849,6 +849,7 @@ class VersionSanitizer(BaseActionSanitizer):
# args for the version.py contain file path without leading --arg key. So apply sanitize # args for the version.py contain file path without leading --arg key. So apply sanitize
# function for all the args. # function for all the args.
self._update_all_args(self._sanitize_filepath_with_location_tag) self._update_all_args(self._sanitize_filepath_with_location_tag)
self._set_value_arg('-e', "'%s'" % self._get_value_arg('-e'))
super()._sanitize_args() super()._sanitize_args()
class JavaCppEnumSanitizer(BaseActionSanitizer): class JavaCppEnumSanitizer(BaseActionSanitizer):