diff options
| author | Cole Faust <colefaust@google.com> | 2023-11-28 19:01:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-28 19:01:14 +0000 |
| commit | 77c93587f27569fb43e26901f85733da21b48d33 (patch) | |
| tree | 00b1110715a885713758fda76c0c84718fa5398e | |
| parent | feae7893a5475f45a811fbfd6d2417aaf6e8ffd5 (diff) | |
| parent | ce6ee96db6ab9a5319bcbe6c1824776dacbfe967 (diff) | |
| download | cronet-77c93587f27569fb43e26901f85733da21b48d33.tar.gz | |
Sandbox cronet genrules am: ce6ee96db6
Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2847745
Change-Id: I64be417b63cb89c99dcca4c1042bb1ec6fe61c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 20 | ||||
| -rwxr-xr-x | android/tools/gn2bp/gen_android_bp | 8 |
2 files changed, 23 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 4296c2ad4..27b4c9ea8 100644 --- a/Android.bp +++ b/Android.bp @@ -893,12 +893,15 @@ cc_genrule { "--input_file " + "java/lang/Runtime.class " + "--javap " + - "$$(find $${OUT_DIR:-out}/.path -name javap) " + + "$(location :javap) " + "--package_prefix " + "android.net.connectivity", out: [ "base/android_runtime_jni_headers/Runtime_jni.h", ], + tools: [ + ":javap", + ], tool_files: [ ":current_android_jar", "base/android/jni_generator/android_jar.classes", @@ -929,10 +932,13 @@ cc_genrule { "--input_file " + "java/lang/Runtime.class " + "--javap " + - "$$(find $${OUT_DIR:-out}/.path -name javap)", + "$(location :javap)", out: [ "base/android_runtime_jni_headers/Runtime_jni.h", ], + tools: [ + ":javap", + ], tool_files: [ ":current_android_jar", "base/android/jni_generator/android_jar.classes", @@ -964,12 +970,15 @@ cc_genrule { "--input_file " + "java/lang/Runnable.class " + "--javap " + - "$$(find $${OUT_DIR:-out}/.path -name javap) " + + "$(location :javap) " + "--package_prefix " + "android.net.connectivity", out: [ "base/android_runtime_unchecked_jni_headers/Runnable_jni.h", ], + tools: [ + ":javap", + ], tool_files: [ ":current_android_jar", "base/android/jni_generator/android_jar.classes", @@ -1001,10 +1010,13 @@ cc_genrule { "--input_file " + "java/lang/Runnable.class " + "--javap " + - "$$(find $${OUT_DIR:-out}/.path -name javap)", + "$(location :javap)", out: [ "base/android_runtime_unchecked_jni_headers/Runnable_jni.h", ], + tools: [ + ":javap", + ], tool_files: [ ":current_android_jar", "base/android/jni_generator/android_jar.classes", diff --git a/android/tools/gn2bp/gen_android_bp b/android/tools/gn2bp/gen_android_bp index 5cca745b1..376ac1c34 100755 --- a/android/tools/gn2bp/gen_android_bp +++ b/android/tools/gn2bp/gen_android_bp @@ -953,7 +953,7 @@ class JniGeneratorSanitizer(BaseActionSanitizer): def _sanitize_args(self): self._set_value_arg('--jar_file', '$(location :current_android_jar)', False) if self._has_arg('--jar_file'): - self._append_arg('--javap', '$$(find $${OUT_DIR:-out}/.path -name javap)') + self._append_arg('--javap', '$(location :javap)') self._update_value_arg('--output_dir', self._sanitize_filepath) self._update_value_arg('--includes', self._sanitize_filepath, False) self._delete_value_arg('--prev_output_dir', False) @@ -980,6 +980,12 @@ class JniGeneratorSanitizer(BaseActionSanitizer): for file in tool_files } return tool_files + def get_tools(self): + tools = super().get_tools() + if self._has_arg('--jar_file'): + tools.add(":javap") + return tools + class JniRegistrationGeneratorSanitizer(BaseActionSanitizer): def __init__(self, target, arch, is_test_target): self.is_test_target = is_test_target |