From c13c0ea4b0732ebfffbd5c6fd171d04b8d286797 Mon Sep 17 00:00:00 2001 From: Jae Shin Date: Mon, 4 Dec 2017 13:16:21 +0900 Subject: [PATCH] Remove path prefix within VNDK snapshot zip Remove 'android-vndk-snapshot' path prefix when creating VNDK snapshot zip with soong_zip. The path prefix makes it cumbersome to unzip and install the snapshots to prebuilts/vndk/v{version}. Test: development/vndk/snapshot/build.sh && python development/vndk/snapshot/update.py Bug: 69950927 Change-Id: I9e5a1898056627ba98a408f048b7cb710e5ef07c --- core/tasks/vndk.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/tasks/vndk.mk b/core/tasks/vndk.mk index a3ec16a534..962fae1a83 100644 --- a/core/tasks/vndk.mk +++ b/core/tasks/vndk.mk @@ -162,7 +162,7 @@ $(vndk_snapshot_zip): $(vndk_snapshot_dependencies) $(SOONG_ZIP) $(call private-copy-vndk-intermediates, \ $(PRIVATE_VNDK_CORE_OUT),$(PRIVATE_VNDK_CORE_INTERMEDIATES)) $(call private-copy-vndk-intermediates, \ - $(PRIVATE_VNDK_SP_OUT),$(PRIVATE_VNDK_SP_INTERMEDIATES)) + $(PRIVATE_VNDK_SP_OUT),$(PRIVATE_VNDK_SP_INTERMEDIATES)) $(call private-copy-vndk-intermediates, \ $(PRIVATE_CONFIGS_OUT),$(PRIVATE_CONFIGS_INTERMEDIATES)) # TODO(b/69834489): Package additional arch variants @@ -172,8 +172,7 @@ $(vndk_snapshot_zip): $(vndk_snapshot_dependencies) $(SOONG_ZIP) # $(call private-copy-vndk-intermediates, \ # $(PRIVATE_VNDK_SP_OUT_2ND),$(PRIVATE_VNDK_SP_INTERMEDIATES_2ND)) # endif - $(hide) $(SOONG_ZIP) -o $@ -P android-vndk-snapshot -C $(PRIVATE_VNDK_SNAPSHOT_OUT) \ - -D $(PRIVATE_VNDK_SNAPSHOT_OUT) + $(hide) $(SOONG_ZIP) -o $@ -C $(PRIVATE_VNDK_SNAPSHOT_OUT) -D $(PRIVATE_VNDK_SNAPSHOT_OUT) .PHONY: vndk vndk: $(vndk_snapshot_zip)