From ef5e38fef0b80b36101ac66a79bbcff0f22e6605 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 24 Jul 2018 15:34:39 -0700 Subject: tests: Move to Android.bp. Also separate libupdater_defaults out to be shareable. It turns out the `data` property in `cc_test` doesn't follow symlinks as LOCAL_TEST_DATA does in Android.mk. This CL creates a filegroup in top-level Android.bp in order to pick up the testdata for ResourcesTest. Test: `mmma -j bootable/recovery` with aosp_marlin-userdebug Test: Run recovery_{unit,component,manual}_test on marlin. Test: Run recovery_host_test. Change-Id: I4532ab25aeb83c0b0baa8051d5fe34ba7b910a35 --- updater/Android.bp | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) (limited to 'updater') diff --git a/updater/Android.bp b/updater/Android.bp index 9a36ebbb7..c77bac8fb 100644 --- a/updater/Android.bp +++ b/updater/Android.bp @@ -12,27 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -cc_library_static { - name: "libupdater", +cc_defaults { + name: "libupdater_defaults", defaults: [ "recovery_defaults", ], - srcs: [ - "blockimg.cpp", - "commands.cpp", - "install.cpp", - ], - - include_dirs: [ - "external/e2fsprogs/misc", - ], - - export_include_dirs: [ - "include", - ], - static_libs: [ "libapplypatch", "libbootloader_message", @@ -69,3 +55,26 @@ cc_library_static { "libext2fs", ], } + +cc_library_static { + name: "libupdater", + + defaults: [ + "recovery_defaults", + "libupdater_defaults", + ], + + srcs: [ + "blockimg.cpp", + "commands.cpp", + "install.cpp", + ], + + include_dirs: [ + "external/e2fsprogs/misc", + ], + + export_include_dirs: [ + "include", + ], +} -- cgit v1.2.3