diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-14 17:33:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-14 17:33:33 +0000 |
| commit | 81013d47dede2ad12d04a620719786543bda2a8e (patch) | |
| tree | 033ca92a1fa1c4db38c0ee5d9e215374a135e62c | |
| parent | ef6dd3bdd20a0f493a41edfbc7ea74170031c6ac (diff) | |
| parent | a6eff7f4a4d88fb63a28bf3b6948f7ac29bef04a (diff) | |
| download | dexmaker-81013d47dede2ad12d04a620719786543bda2a8e.tar.gz | |
Merge changes I0af4a9a2,Ibafb1749 am: ea67940f95 am: ebfbaaef2e am: a6eff7f4a4
Change-Id: I60ac4b519e60b958aa1198c25309e9eedc5b81df
| -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 |