From 7a504334cd969187d6e31fc0e895af0a51ccb16c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 16 Aug 2018 22:55:43 -0700
Subject: [PATCH 1/2] 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)

From dcc8ec310fdb04ce3634d9572fdc747d9f47a359 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 16 Aug 2018 22:58:14 -0700
Subject: [PATCH 2/2] Add jni shared libraries to java soong_to_convert
 problems

Soong doesn't support LOCAL_JNI_SHARED_LIBRARIES yet, add it to the
problems list.

Bug: 80095087
Test: examine soong_to_convert.txt
Change-Id: I44f7a486b1e9de276416f74a4cb2b7f4eafce4ef
---
 core/java_common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java_common.mk b/core/java_common.mk
index 9c4fa89c8b..e1ec30b97f 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -6,6 +6,10 @@ ifneq ($(filter ../%,$(LOCAL_SRC_FILES)),)
 my_soong_problems += dotdot_srcs
 endif
 
+ifneq (,$(LOCAL_JNI_SHARED_LIBRARIES))
+my_soong_problems += jni_libs
+endif
+
 ###########################################################
 ## Java version
 ###########################################################