diff options
| author | Bill Rassieur <rassb@google.com> | 2019-04-03 21:57:51 +0000 |
|---|---|---|
| committer | Bill Rassieur <rassb@google.com> | 2019-04-03 21:57:51 +0000 |
| commit | d0b1d02a1347ca573542ffdf708c1fca38c7af71 (patch) | |
| tree | 73ea7b17d529b31d2818cbdafdd46d9c83d9280b | |
| parent | 9ac370c2c4abaabd9cf8632ec2e85af2e37f8c41 (diff) | |
| parent | 9a1d3ec50905d5dabbd1ce393e5715df43cc3d1e (diff) | |
| download | dalvik-d0b1d02a1347ca573542ffdf708c1fca38c7af71.tar.gz | |
Merge master@5433138 into git_qt-dev-plus-aosp.
Change-Id: I32380553a86f92703bc51713310a9c8d117d91f2
BUG: 129345239
| -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"], |