diff options
author | Martin Stjernholm <mast@google.com> | 2019-04-02 06:31:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-02 06:31:45 -0700 |
commit | 9a1d3ec50905d5dabbd1ce393e5715df43cc3d1e (patch) | |
tree | 73ea7b17d529b31d2818cbdafdd46d9c83d9280b | |
parent | 9ac370c2c4abaabd9cf8632ec2e85af2e37f8c41 (diff) | |
parent | 790cf8dbefd652278c3013161106cc5e16850f34 (diff) | |
download | dalvik-android10-dev.tar.gz |
Merge "Remove unused dependency on libutils." am: 2a17f89d12 am: 7e7fd6b3b6android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: 790cf8dbef
Change-Id: I2ae2a7a88756ebeecb8c44f712180a7659e219ca
-rw-r--r-- | dexdump/Android.bp | 2 | ||||
-rw-r--r-- | libdex/Android.bp | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/dexdump/Android.bp b/dexdump/Android.bp index 7f9c24054..2dbb1e42d 100644 --- a/dexdump/Android.bp +++ b/dexdump/Android.bp @@ -36,14 +36,12 @@ cc_binary { shared_libs: [ "libz", "liblog", - "libutils", ], }, host: { static_libs: [ "libdex", "libbase", - "libutils", "liblog", "libz", ], diff --git a/libdex/Android.bp b/libdex/Android.bp index ad0128bc7..737e097cd 100644 --- a/libdex/Android.bp +++ b/libdex/Android.bp @@ -48,12 +48,6 @@ cc_library_static { "-Wimplicit-fallthrough", ], target: { - android: { - shared_libs: ["libutils"], - }, - host: { - static_libs: ["libutils"], - }, windows: { enabled: true, cflags: ["-Wno-unused-parameter"], |