From 7a504334cd969187d6e31fc0e895af0a51ccb16c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 Aug 2018 22:55:43 -0700 Subject: [PATCH] Fix java soong_to_convert data soong_to_convert looks for modules with no unconverted deps, but the list of converted modules was not being updated for java and app prebuilts. That meant soong_to_convert only reported modules with no deps at all. Test: examine soong_to_convert.txt Change-Id: I136e6fa74153a80df5ecd767642bb2feb2ddb9dc --- core/soong_app_prebuilt.mk | 2 ++ core/soong_java_prebuilt.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index fcd3baff08..241a2f4dea 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -104,3 +104,5 @@ ifdef LOCAL_SOONG_RRO_DIRS $(LOCAL_EXPORT_PACKAGE_RESOURCES), \ $(LOCAL_SOONG_RRO_DIRS)) endif + +SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE) diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 210ee5f149..92b97bd7b6 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -161,3 +161,5 @@ $(my_exported_sdk_libs_file): $(if $(PRIVATE_EXPORTED_SDK_LIBS),\ $(hide) echo $(PRIVATE_EXPORTED_SDK_LIBS) | tr ' ' '\n' > $@,\ $(hide) touch $@) + +SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE)