StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I44f7a486,I136e6fa7

Browse Source 
* changes:
  Add jni shared libraries to java soong_to_convert problems
  Fix java soong_to_convert data
This commit is contained in:
Treehugger Robot
2018-08-17 23:11:56 +00:00
committed by Gerrit Code Review
parent 68883e0717 dcc8ec310f
commit fe411d1860
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java_common.mk
View File

@@ -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
###########################################################

2
core/soong_app_prebuilt.mk
View File

@@ -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)

2
core/soong_java_prebuilt.mk
View File

@@ -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)