summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86"HEADmasterVictor Khimenko2020-09-172-10/+18
|\
| * Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86Victor Khimenko2020-09-172-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently target:arm_on_x86 is defined both for native_bridge targets and for non-native_bridge targets. But we already have a way to detect native_bridge. Also fixed 64-bit paths. Bug: http://b/153609531 Test: cts-tradefed run cts --abi armeabi-v7a -m CtsRsCppTestCases Test: cts-tradefed run cts --abi arm64-v8a -m CtsRsCppTestCases Change-Id: I2f0770fe8d406b5a9b8a491a7d87202d2a674d24
* | Merge "Merge Android R"Xin Li2020-09-101-1/+1
|\ \
| * | Merge Android RXin Li2020-09-081-1/+1
|/| | | | | | | | | | | | | | | | | Bug: 168057903 Merged-In: Ib9d9a5de99b0d4d9ead2be30d9df912b8fc080b8 Change-Id: I97ee0233f6adee12066b2ccefd2d9eee4f864c29
| * | Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into ↵Xin Li2020-09-011-1/+1
| |\ \ | | | | | | | | | | | | stage-aosp-master
| | * \ Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-271-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 166295507 Merged-In: Idba18eddd9a4519604c0ddaa0d734fb426092f6c Change-Id: I118d2bc7f539e04a3d500b3a0178a137aaa827a5
| | | * \ Always register libclcore_neon.bc am: f5a5fd6c62Yo Chiang2020-07-141-10/+8
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/12139245 Change-Id: Idba18eddd9a4519604c0ddaa0d734fb426092f6c
| | | | * | Always register libclcore_neon.bcandroid11-devYo Chiang2020-07-131-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and let PRODUCT_PACKAGES decide if libclcore_neon.bc needs to be installed or not. TARGET module libRS_internal.native_bridge requires non-existent TARGET module: libclcore_neon.bc Bug: 7456955 Bug: 153609531 Test: TH build_test Change-Id: Ieb818e2a2f31fcae1e4f744081a2cde728cdcc03
| | | * | | [automerger skipped] Make libRSDriver buildable for native bridge am: ↵Victor Khimenko2020-07-140-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6baf771fa8 -s ours am skip reason: Change-Id I9f0f376a4e56dbca0ba14fb19fc58740baf53691 with SHA-1 f7c84f10f5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/12128054 Change-Id: If27b3393c4bb8fad46930eae0193b7b08fa74309
| | | | * | Make libRSDriver buildable for native bridgeVictor Khimenko2020-07-102-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/153609531 Test: m libRSDriver.native_bridge Change-Id: I9f0f376a4e56dbca0ba14fb19fc58740baf53691 Merged-In: I9f0f376a4e56dbca0ba14fb19fc58740baf53691
| | | * | | Merge "Make libRSDriver buildable for native bridge" am: 5078b11b88 am: ↵Victor Khimenko2020-07-092-0/+47
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62271931ae Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1358404 Change-Id: I19f3c8237b70655adf7bb9cfca390d6dd454f848
| | | * \ \ \ Merge "Use jni_headers instead of JNI_H_INCLUDE" am: fea750bdca am: 23e552d0b5Orion Hodson2020-07-063-5/+3
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1354186 Change-Id: Iad15eaa285c7182e389fe44eb6ee11484ec81684
| | | * \ \ \ \ [automerger skipped] Use libnativewindow for platform variant of ↵Colin Cross2020-05-020-0/+0
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libRSSupport am: 81f706ca2b -s ours am skip reason: Change-Id Ife99745fbb57c1d85241cf95c3a9767589d97f46 with SHA-1 d969efe48a is in history Change-Id: I3fd14dac2d35de4b9b57ffea3ba0aba20acd3769
| | | | * | | | Use libnativewindow for platform variant of libRSSupportColin Cross2020-04-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDK variant of libRSSupport doesn't need libnativewindow as that library didn't exist in sdk version 16, but it is necessary for the platform variant. Bug: 149591340 Test: m checkbuild Change-Id: Ife99745fbb57c1d85241cf95c3a9767589d97f46 Merged-In: Ife99745fbb57c1d85241cf95c3a9767589d97f46 (cherry picked from commit d969efe48abe8f63142e72052a84685320154d81)
| | | * | | | | Merge "Add dependencies on jni_headers" am: d3f80c78b0 am: 369b4ca333Orion Hodson2020-04-142-2/+13
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a7c9dd4efb5695910c81f92c9bcc4fca0429695
| | | * \ \ \ \ \ Merge "Include what you use: <fcntl.h>" am: 37a6a4aa37 am: 07255b7fbdTreehugger Robot2020-04-131-0/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7646dec8c1c89d5d5217f0ecb813e77da22bd9ea
| | | * \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: ffbb983d18 -s ours am skip reason: subject contains skip directive Change-Id: I899ee0d7fcf420a7f61b18eaa2344c19948ed9ca
| | | * \ \ \ \ \ \ \ [automerger skipped] Merge "Fix VNDK path" am: 90d3f3f0b3 am: 57d7158409 -s oursTreehugger Robot2020-04-100-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Ic2d5040a14b960562ffcba0d5589d120bd27c6aa with SHA-1 dc42cee700 is in history Change-Id: I3e1b4ce24ac53aec87e7666f9239592ff03fe24d
| | | * \ \ \ \ \ \ \ \ Merge "Revert "Revert "Use libnativewindow for platform variant of libR..."" ↵Colin Cross2020-04-081-0/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1bf3901e2b am: 1fe7261e04 Change-Id: I2256f92ca736698094454281c5c16ccd66ae18a6
| | | * \ \ \ \ \ \ \ \ \ Fix VNDK path am: dc42cee700Jooyung Han2020-04-072-9/+6
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I5adf920ca0f0b33a068376a738fddf65b02ad8e3
| | | | * | | | | | | | | Fix VNDK pathJooyung Han2020-03-272-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, isRunningInVndkNamespace returns true if the shared object is loaded from the path including "/vndk-sp". This change fixes it to use a new VNDK path. And also getVndkSysLibPath() is amended as well. Bug: 151635128 Test: build Change-Id: Ic2d5040a14b960562ffcba0d5589d120bd27c6aa
| | | * | | | | | | | | | Merge "Revert "Use libnativewindow for platform variant of libRSSupport"" ↵Colin Cross2020-04-071-6/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 505f2d8e94 am: a6a43a233b Change-Id: Ia79191920b9205f45686a36fda670f6f9b54fd1e
| | | * \ \ \ \ \ \ \ \ \ \ Merge "Use libnativewindow for platform variant of libRSSupport" am: ↵Colin Cross2020-04-071-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e173246b1 am: 5368514232 Change-Id: Ifd704e5bdc587f90d255f74e3b3e1b16ac53bb5a
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Updates dist-for-goals for RSUnbundledTests19." am: 0e1ec97a2a am: ↵Daniel Norman2020-04-011-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4731a5f5c5 Change-Id: I57c9fab1b3771426fe875f06507f5e24279663f9
| | | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: a23f0b1321 -s ours am skip reason: subject contains skip directive Change-Id: Ic92e187d25a584bd0e3b89db745fc5b7a0e639c4
| | | * | | | | | | | | | | | | Merge "Revert "Disable clang-tidy for ScriptIntrinsicBLAS.cpp"" am: ↵Automerger Merge Worker2020-02-071-2/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d51e9c5c3f am: b177df2af4 am: 0325f1b4cf Change-Id: Id2924157393ff4a74538e31e01fdf75662687d4c
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Update code generator for RSStubsWhiteList" am: afc55a8ac2 am: ↵Automerger Merge Worker2020-01-272-2/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baa06293d2 am: b330838eb9 Change-Id: Idb066ee8f60d4b1a66b36987ef620bd79d75980b
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Disable clang-tidy for ScriptIntrinsicBLAS.cpp" am: 575d2c05f5 am: ↵Automerger Merge Worker2020-01-071-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27af47455e am: 93e611439e Change-Id: Id0916299b5354dd733f35f8ec8a4b9629213d8e1
| | | * | | | | | | | | | | | | | | | libRScpp: remove dependency on libgui_headersMarissa Wall2019-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libRScpp should depend on libgui directly instead of its headers. Currently when a new dependency is added to a libgui header (including dependencies in the headers it includes such as libui), libRScpp must manually add the dependency. By depending on libgui directly, it will automatically receive the dependencies exported by libgui. Bug: 145624276 Test: Compiles Change-Id: I84dec24e05f74b5686e1d5b48f40a4aaee8be27c
| | | * | | | | | | | | | | | | | | | Merge "Remove unused link libraries" am: bd019e84d1 am: 2bc5bcf1c0Marco Nelissen2019-11-081-2/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6444bd7c5c Change-Id: I0d0ec3d64aa1ca5569a941cb3dc5e8e1c31fa8ad
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Inferenced AVX2/FMA Intrinsics in frameworks renderscript module" am: ↵jaishank2019-11-052-0/+87
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9feac4e301 am: 991aae1b85 am: 8abe02d7a7 Change-Id: Ic16d2fa1a1769d06503baeae848671b556941a9a
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - ↵Xin Li2019-10-300-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 85f2f45c90 am: cae3e678fa -s ours am skip reason: subject contains skip directive Change-Id: Ibededdd5b3b1a7aff3f1d6292e13dfa61f90024e
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "[RenderScript] fix -Wimplicit-int-float-conversion" am: c34958630c ↵Nick Desaulniers2019-10-151-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7bb2ddae9c am: 64375b40a8 am: 2fe1fdfd8f Change-Id: I68a082ea77499a5321503f1ee5db1c5aa4c0eba7
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Let RS support lib to load shared object without absolute path." am: ↵Miao Wang2019-09-101-18/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a40e1d8a4 am: 9cf8df3722 am: 5398deaa45 am: 444a2050da Change-Id: Idf589d19d228b12a816088172ffcf9709a5828e5
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: f581705105 -s ours am: 81e13462d1 -s ours am: 10abf2e439 -s ours am skip reason: change_id I3719ce465d2bc67977ea615065d1b7184333b53c with SHA1 fdc2bafdf7 is in history Change-Id: Ic0fac699ae5f2fdf641e5a50c2400415cae1495e
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove libhwbinder/libhidltransport deps" am: eb0a4fbb62 am: ↵Steven Moreland2019-09-061-2/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdc2bafdf7 am: acddb7f3e8 am: 293c2e04d3 Change-Id: If722472e86b8c64e3cdb0688fb5218f5d06dea5f
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b28626d2d3 -s ours am: 3bf41b8147 am: f0ce26ec7a am: 9eb1b9a245 -s ours am skip reason: subject contains skip directive Change-Id: I47223b5611593c9c802e8cfe7497a6a94bba6b2b
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Use build/soong/soong_ui.bash instead of make" am: afa0b842e6 am: ↵Dan Willemsen2019-07-301-3/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6dddbefcf6 am: 88049addb5 am: 1498235bde am: 80ed76baa0 Change-Id: I42d8792bf442e5fa5df2aa798bfb78ec2536647f
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Simplify the Android.bp file." am: 4eaea8c663 am: 625943237e am: ↵Elliott Hughes2019-07-191-8/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4274ebddd3 am: ac4534cb42 Change-Id: I928c6afcc202f5275c346aa6c554138089ed3fe1
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" ↵Jeffrey Vander Stoep2019-07-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c535768356 -s ours am: a20756993e -s ours am: 78cc3cb362 -s ours am: df469a3d48 -s ours am skip reason: change_id I88b87b253ddb63ba4a4946d185ef76a553ba6fee with SHA1 8ef1cc453d is in history Change-Id: I5465f0d39eb147122a8e9c0152f1f777e81af0fc
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Renderscript: rename .rs extension to .rscript am: ↵Jeff Vander Stoep2019-07-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ef1cc453d -s ours am: 96a7083a4f -s ours am: 76e1c3fe06 -s ours am skip reason: change_id I88b87b253ddb63ba4a4946d185ef76a553ba6fee with SHA1 f539a140c0 is in history Change-Id: I9bed24fc106bf5262669589ea2c707be3631b6de
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Renderscript: rename .rs extension to .rscript am: ↵Jeff Vander Stoep2019-07-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f539a140c0 am: 35b4214cdf -s ours am skip reason: change_id I88b87b253ddb63ba4a4946d185ef76a553ba6fee with SHA1 ab7b68cabd is in history Change-Id: Iefc81bd89846a45234047fc512394702b1d8d823
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Reduce use of deprecated include_dirs" am: ae3f4dd6b6 am: 2e5144e068 ↵Paul Duffin2019-07-171-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b3857425e3 am: 931b7d4ccc Change-Id: I5bc3536e53dfd3ea03bde27691781bb48b965fd8
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renderscript: rename .rs extension to .rscriptJeff Vander Stoep2019-07-15384-347/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reserve .rs extension for Rust. Bug: 137365032 Test: make checkbuild Test: cd frameworks/compile/slang/tests ./slang_tests.py Test: atest CtsRenderscriptTestCases Test: CtsRsCppTestCases Change-Id: I88b87b253ddb63ba4a4946d185ef76a553ba6fee
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li2019-07-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5699924) into stage-aosp-master am: da128f2e97 am: 29fffa8f14 -s ours am skip reason: subject contains skip directive Change-Id: I676013b77ba2e4d3a72e60aefcc84fe1baaaf969
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Clarify license terms for Romain Guy's artwork." am: 15344331c5 am: ↵Bob Badour2019-06-062-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88995dfb74 am: 8427e65955 am: e9953de5e7 Change-Id: Ib9cf770260957179fe3eb2202b9451176d9413fd
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove unused rsov driver." am: fc3236fd01 am: d96e613260 am: de2c8dd84cStephen Hines2019-05-17158-16285/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: be79921d0e Change-Id: I87812a59c3dd5338f0a22d849701581b499666d7
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make libRS.so buildable for native bridge" am: 8b50f08849Victor Khimenko2020-08-312-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1406068 Change-Id: Ib9d9a5de99b0d4d9ead2be30d9df912b8fc080b8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make libRS.so buildable for native bridge"Victor Khimenko2020-08-312-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make libRS.so buildable for native bridgeVictor Khimenko2020-08-212-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/153609531 Test: m libRS.native_bridge Change-Id: I9dc5c921fde25a67efee8941041904e8fa37386f
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-10 16:27:58 +0000