diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-14 16:23:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-14 16:23:06 +0000 |
| commit | ea67940f951635bc3c2f73a796f92edf4c3c30c0 (patch) | |
| tree | e482113e9f4a0a33a02336ace03339ac9dda21f2 | |
| parent | d2a09b882a9db481a48d22887aa45af55ac1953d (diff) | |
| parent | cf2f14c4579a40b07323bf771d86085d2ccba671 (diff) | |
| download | dexmaker-ea67940f951635bc3c2f73a796f92edf4c3c30c0.tar.gz | |
Merge changes I0af4a9a2,Ibafb1749
* changes:
Add dependency on jni_headers
Add a repohook for bpfmt
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | PREUPLOAD.cfg | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -78,7 +78,8 @@ cc_defaults { ], header_libs: [ - "libopenjdkjvmti_headers", + "jni_headers", + "libopenjdkjvmti_headers", ], } @@ -137,7 +138,7 @@ java_library_static { ], required: [ "libdexmakerjvmtiagent", - "libstaticjvmtiagent" + "libstaticjvmtiagent", ], } diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..b558ce7 --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Builtin Hooks] +bpfmt = true
\ No newline at end of file |