commit 96ffb50fb26b861f967e26ed475beddad9e22dcb
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 25 05:10:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 25 05:10:39 2019 -0700
tree c026ef0a15eec7f31ddf59e65c7ed2ea4d2e31f1
parent be8ddf4cc5f98bca5c0fb62bdc60873d7c8960ed
parent 42706af0fe8f4393c0d5478f02df4c5e77f3f001

Merge "Allow makefiles to be parsed in a trimmed down manifest."
am: 7b50fc4bef

Change-Id: I345b2a9b9dc412eca7fb7eb22970e3d75a7dc068

fs_mgr/libdm/Android.mk

diff --git a/fs_mgr/libdm/Android.mk b/fs_mgr/libdm/Android.mk
index a701aa2..6aedc25 100644
--- a/fs_mgr/libdm/Android.mk
+++ b/fs_mgr/libdm/Android.mk
@@ -19,4 +19,4 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelLibdmTest
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk

fs_mgr/liblp/Android.mk

diff --git a/fs_mgr/liblp/Android.mk b/fs_mgr/liblp/Android.mk
index 53a050b..7f7f891 100644
--- a/fs_mgr/liblp/Android.mk
+++ b/fs_mgr/liblp/Android.mk
@@ -19,4 +19,4 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelLiblpTest
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk