diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-07-11 03:41:39 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-11 03:41:39 +0200 |
| commit | 04708fe48ec74289523a109b6e818cfa6f1510a2 (patch) | |
| tree | 16df242234a5d4fd225181946845bae9f4f0b3f1 | |
| parent | Merge "minadbd sends heartbeat to rescue service for getprop command." am: 89cc79cbb6 am: d9ec0bbd06 (diff) | |
| parent | Merge "Remove libimgpatch" am: ed96da6664 (diff) | |
| download | android_bootable_recovery-04708fe48ec74289523a109b6e818cfa6f1510a2.tar android_bootable_recovery-04708fe48ec74289523a109b6e818cfa6f1510a2.tar.gz android_bootable_recovery-04708fe48ec74289523a109b6e818cfa6f1510a2.tar.bz2 android_bootable_recovery-04708fe48ec74289523a109b6e818cfa6f1510a2.tar.lz android_bootable_recovery-04708fe48ec74289523a109b6e818cfa6f1510a2.tar.xz android_bootable_recovery-04708fe48ec74289523a109b6e818cfa6f1510a2.tar.zst android_bootable_recovery-04708fe48ec74289523a109b6e818cfa6f1510a2.zip | |
| -rw-r--r-- | applypatch/Android.bp | 32 | ||||
| -rw-r--r-- | tests/Android.bp | 5 |
2 files changed, 2 insertions, 35 deletions
diff --git a/applypatch/Android.bp b/applypatch/Android.bp index 64dd38d24..42aa52954 100644 --- a/applypatch/Android.bp +++ b/applypatch/Android.bp @@ -168,35 +168,3 @@ cc_binary_host { "libz", ], } - -cc_library_static { - name: "libimgpatch", - - // The host module is for recovery_host_test (Linux only). - host_supported: true, - - defaults: [ - "applypatch_defaults", - ], - - srcs: [ - "bspatch.cpp", - "imgpatch.cpp", - ], - - static_libs: [ - "libbase", - "libbspatch", - "libbz", - "libcrypto", - "libedify", - "libotautil", - "libz", - ], - - target: { - darwin: { - enabled: false, - }, - }, -} diff --git a/tests/Android.bp b/tests/Android.bp index 1801f3b5f..a86704015 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -50,12 +50,11 @@ cc_defaults { }, } -// libapplypatch, libapplypatch_modes, libimgpatch +// libapplypatch, libapplypatch_modes libapplypatch_static_libs = [ "libapplypatch_modes", "libapplypatch", "libedify", - "libimgpatch", "libotautil", "libbsdiff", "libbspatch", @@ -180,7 +179,7 @@ cc_test_host { target: { darwin: { - // libimgdiff is not available on the Mac. + // libapplypatch in "libupdater_defaults" is not available on the Mac. enabled: false, }, }, |