diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-03-29 23:04:04 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-29 23:04:04 +0100 |
| commit | 8e39f3d54e0cb403be80c248286be14a5a427814 (patch) | |
| tree | b31bd3f84794bbbea30d04e2e7465d0957fee209 /tests | |
| parent | Merge "Use flags = 0 to avoid fd closing for child updater process" am: 50bda24f1e am: 111663d893 (diff) | |
| parent | Merge "Move install to separate module" am: a232d9dccb (diff) | |
| download | android_bootable_recovery-8e39f3d54e0cb403be80c248286be14a5a427814.tar android_bootable_recovery-8e39f3d54e0cb403be80c248286be14a5a427814.tar.gz android_bootable_recovery-8e39f3d54e0cb403be80c248286be14a5a427814.tar.bz2 android_bootable_recovery-8e39f3d54e0cb403be80c248286be14a5a427814.tar.lz android_bootable_recovery-8e39f3d54e0cb403be80c248286be14a5a427814.tar.xz android_bootable_recovery-8e39f3d54e0cb403be80c248286be14a5a427814.tar.zst android_bootable_recovery-8e39f3d54e0cb403be80c248286be14a5a427814.zip | |
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.bp | 7 | ||||
| -rw-r--r-- | tests/component/install_test.cpp | 4 | ||||
| -rw-r--r-- | tests/component/verifier_test.cpp | 4 | ||||
| -rw-r--r-- | tests/unit/asn1_decoder_test.cpp | 2 | ||||
| -rw-r--r-- | tests/unit/package_test.cpp | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index ef5919eb5..09ef716d6 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -76,9 +76,9 @@ libapplypatch_static_libs = [ librecovery_static_libs = [ "librecovery", "librecovery_fastboot", + "libinstall", + "librecovery_ui", "libminui", - "libpackage", - "libverifier", "libotautil", "libhealthhalutils", @@ -116,10 +116,9 @@ cc_test { ], static_libs: libapplypatch_static_libs + [ + "libinstall", "librecovery_ui", "libminui", - "libpackage", - "libverifier", "libotautil", "libupdater", "libgtest_prod", diff --git a/tests/component/install_test.cpp b/tests/component/install_test.cpp index 969805b42..385132939 100644 --- a/tests/component/install_test.cpp +++ b/tests/component/install_test.cpp @@ -32,9 +32,9 @@ #include <ziparchive/zip_archive.h> #include <ziparchive/zip_writer.h> -#include "install.h" +#include "install/install.h" #include "otautil/paths.h" -#include "private/install.h" +#include "private/setup_commands.h" static void BuildZipArchive(const std::map<std::string, std::string>& file_map, int fd, int compression_type) { diff --git a/tests/component/verifier_test.cpp b/tests/component/verifier_test.cpp index bdb8af231..ded23c52f 100644 --- a/tests/component/verifier_test.cpp +++ b/tests/component/verifier_test.cpp @@ -35,9 +35,9 @@ #include <ziparchive/zip_writer.h> #include "common/test_constants.h" +#include "install/package.h" +#include "install/verifier.h" #include "otautil/sysutil.h" -#include "package.h" -#include "verifier.h" using namespace std::string_literals; diff --git a/tests/unit/asn1_decoder_test.cpp b/tests/unit/asn1_decoder_test.cpp index b334a655b..d94dd4353 100644 --- a/tests/unit/asn1_decoder_test.cpp +++ b/tests/unit/asn1_decoder_test.cpp @@ -20,7 +20,7 @@ #include <gtest/gtest.h> -#include "asn1_decoder.h" +#include "private/asn1_decoder.h" TEST(Asn1DecoderTest, Empty_Failure) { uint8_t empty[] = {}; diff --git a/tests/unit/package_test.cpp b/tests/unit/package_test.cpp index fa492d38b..a735a699e 100644 --- a/tests/unit/package_test.cpp +++ b/tests/unit/package_test.cpp @@ -26,7 +26,7 @@ #include <ziparchive/zip_writer.h> #include "common/test_constants.h" -#include "package.h" +#include "install/package.h" class PackageTest : public ::testing::Test { protected: |