gn2bp: gn_utils should not touch action args am: 7aa98f9cdb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2276595
Change-Id: If8709395f0a8625e6d7559e706113ab093f7d877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index d6aa87a..99dc695 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -268,9 +268,9 @@
"--output_dir " +
"gen/jni_headers/base/android_runtime_jni_headers " +
"--includes " +
- "//../../../../base/android/jni_generator/jni_generator_helper.h " +
+ "../../../../../../base/android/jni_generator/jni_generator_helper.h " +
"--jar_file " +
- "//third_party/android_sdk/public/platforms/android-33/android.jar " +
+ "../../third_party/android_sdk/public/platforms/android-33/android.jar " +
"--output_name " +
"Runnable_jni.h " +
"--output_name " +
@@ -1016,7 +1016,7 @@
"--output_dir " +
"gen/jni_headers/base/base_jni_headers " +
"--includes " +
- "//../../../../base/android/jni_generator/jni_generator_helper.h " +
+ "../../../../../../base/android/jni_generator/jni_generator_helper.h " +
"--use_proxy_hash " +
"--output_name " +
"ApkAssets_jni.h " +
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index ef3bf55..82ff2bb 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -233,6 +233,7 @@
# Args are typically relative to the root build dir (../../xxx)
# because root build dir is typically out/xxx/).
target.args = [re.sub('^../../', '//', x) for x in desc['args']]
+ target.args = desc['args']
target.response_file_contents = self._get_response_file_contents(desc)
elif target.type == 'copy':
# TODO: copy rules are not currently implemented.