Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe411d18 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I44f7a486,I136e6fa7 

* changes:
  Add jni shared libraries to java soong_to_convert problems
  Fix java soong_to_convert data
parents 68883e07 dcc8ec31

core/java_common.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

###########################################################

core/soong_app_prebuilt.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)

core/soong_java_prebuilt.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)