commit 904e1735c81922fd0f1140d1ed2971e4a68d7046
author jschung <jschung@google.com> Wed Apr 21 16:09:11 2021 +0900
committer jschung <jschung@google.com> Thu Apr 29 16:32:47 2021 +0900
tree 254e7e69d7cc774ca48dbb31533268f1ada3247c
parent 6506d653a7d49884eb2b450966a8c013d8b9a689

Include android-gts/lib folder in android-gts.zip

Some gts tests such as JniUncompressGtsTestCases need native libraries
and those should be located under android-gts/lib.

Test: confirmed that the android-gts.zip includes lib folder
Bug: 186595833
Change-Id: I7d0605d0aff861059e3788630585e9ba412f9cac

core/tasks/tools/compatibility.mk

diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk
index 570a39a..7d08a2f 100644
--- a/core/tasks/tools/compatibility.mk
+++ b/core/tasks/tools/compatibility.mk
@@ -64,7 +64,7 @@
   $(SOONG_ZIP) \
   $(host_shared_libs) \
 
-compatibility_zip_resources := $(out_dir)/tools $(out_dir)/testcases
+compatibility_zip_resources := $(out_dir)/tools $(out_dir)/testcases $(out_dir)/lib $(out_dir)/lib64
 
 # Test Suite NOTICE files
 test_suite_notice_txt := $(out_dir)/NOTICE.txt