commit 56dd1356e560e894a0a74a039bbc28118fb51830
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 25 05:31:03 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 25 05:31:03 2019 -0700
tree f255295bd1a969b454cfd93579bb095a29d49f44
parent 686955b64f796d9c0702c1de169268ec82efbf2c
parent 311561b7c0b99f5cac0f8472f2106157ff5a0b92

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

Change-Id: Iba423799a31fcdc71600c8da45b26c79f265939e

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