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

Move aapt2.mk before java.mk

Browse Source 
aapt2.mk will export a srcjar that will be compiled by java.mk, so
it needs to be evaluated first.  Also move java_renderscript.mk
before aapt2.mk so that the generated resoures are available.

Bug: 73885582
Test: m checkbuild
Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates &&
      m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp
Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede
Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede
(cherry picked from commit 8528eabbba)
This commit is contained in:
Colin Cross
2018-03-06 16:21:36 -08:00
parent 39772fedde
commit 7a28158b90
4 changed files with 141 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java.mk
View File

@@ -106,11 +106,6 @@ LOCAL_INTERMEDIATE_TARGETS += \
LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
###############################################################
## .rs files: RenderScript sources to .java files and .bc files
###############################################################
include $(BUILD_SYSTEM)/java_renderscript.mk
###########################################################
## AIDL: Compile .aidl files to .java
###########################################################