(1) Incorrect path to librsjni.so because of typo in earlier change;
fixed by fixing typo.
(2) clang did not specify the target architecture (I don't know what
changed so that this no longer works); fixed by specifying target
architecture and changing from gcc linker to lld (gcc linker didn't
understand the options it was being passed by clang).
Test: blueline-userdebug
Test: make -j FORCE_BUILD_RS_COMPAT=true ENABLE_RSTESTS=true \
RSTestForward_21_1_2 RSTestForward_22_0_2 \
RSTestForward_23_0_3 RSTestForward_24_0_3 RSTestForward_25_0_2 \
RSTestBackward RSTestBackward19 RSTest RSTest_Compat RSTest_Compat19
Test: unzip -t ${PATH_TO_APK}
# confirm that .so files are present in RSTest_Compat[19] but not
for the other APKs
# confirm that .bc files are present in RSTestBackward19 but not
for the other APKs
Test: adb shell am instrument [--abi armeabi-v7a] \
-w ${TEST_PACKAGE_NAME}/androidx.test.runner.AndroidJUnitRunner
# Run four times:
# "--abi" argument present or absent; always omit for
# RSTest_Compat[19], which only support platform default ABI
# "adb shell setprop debug.rs.forcecompat 0" or "1"
# Note that RSTestBackward19 only supports 32-bit ABI, so both
# runs (with and without "--abi" argument) are actually armeabi-v7a
Test: After run, check logcat for RenderScript_jni
# (missing): not built against support library; expected for all
tests except RSTest_Compat[19]
# "RenderScript_jni: RS native mode"; expected for RSTest_Compat[19]
when setprop debug.rs.forcecompat is 0
# "RenderScript_jni: RS compat mode"; expected for RSTest_Compat[19]
when setprop debug.rs.forcecompat is 1
Change-Id: Icfaa226f2e1bfa909cb3bcbbe960f2804c355d2a
- TARGET_BUILD_UNBUNDLED_IMAGE is similar to TARGET_BUILD_APPS, but
its targets are the unbundled partitions instead of apps.
- Rename TARGET_BUILD_APPS_USE_PREBUILT_SDK to TARGET_BUILD_USE_PREBUILT_SDKS
because it is used even without TARGET_BUILD_APPS.
-Instead of TARGET_BUILD_APPS, use TARGET_BUILD_USE_PREBUILT_SDKS
to build java modules with prebuilt sdks, and propagate to Soong.
Bug: 160390776
Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage
Change-Id: Ie096212ccbcca0018baae55e106af693b002c9e5
Caught by https://android-review.googlesource.com/861510
Bug: 121058584
Test: m out/target/common/obj/APPS/Gallery2_intermediates/renderscript/rs.srcjar
Test: NINJA_ARGS="-t deps out/target/common/obj/APPS/Gallery2_intermediates/renderscript/rs.srcjar" m
Change-Id: I92a803963f4431e8506b1f2517a7186d16667709
Apparently empty PRIVATE_RS_TARGET_API is not the same as current,
pass 0 explicitly.
Test: forrest ub-renderscript-test
Change-Id: I8b2001b12161f07c404f78f63a80d82dffa1075f
Renderscript was using LOCAL_RENDERSCRIPT_TARGET_API := 0 to mean
current. Use current instead, and check for it when comparing
if LOCAL_RENDERSCRIPT_TARGET_API >= 21.
Fixes an issue where LOCAL_RENDERSCRIPT_TARGET_API := 0 was being
treated as < 21, causing the renderscript resources to be passed
to aapt2:
out/target/common/obj/APPS/RSTestBackward_intermediates/flat-res/zip_res.flata.contents/raw/bc32: error: resource file cannot be a directory.
Bug: 79481102
Test: m java FORCE_AAPT2=true
Change-Id: I7726d0463ce1693bc9653b4d869ced181c491036
Move java renderscript support to java_renderscript.mk in
preparation to moving it before aapt. Filter *.rs files
out of LOCAL_SRC_FILES and forbid them in java_common.mk
so that using *.rs files is an error if java_renderscript.mk
was not included.
Bug: 73885582
Test: m checkbuild
Change-Id: Ib37ce89daee58b025dec98f733c5a08149641afd
Merged-In: Ib37ce89daee58b025dec98f733c5a08149641afd
(cherry picked from commit 71822d6fb9)
