aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Merge changes from topic "no-platform-app-glue" am: ↵HEADmasterOrion Hodson2020-06-030-0/+0
|\ | | | | | | | | | | | | | | | | | | 5c465fff5e am: 9eb54ab3f7 -s ours am skip reason: Change-Id I5f3d9b27dc3911af6d96b77afd4aacef305f93f1 with SHA-1 f1b60ffc99 is in history Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/1291294 Change-Id: Ib21f5a04c6483c0b162f5b70c3a5d40899965f29
| * Merge changes from topic "no-platform-app-glue" am: 5c465fff5eandroid-r-beta-3android-r-beta-2Orion Hodson2020-06-032-0/+2
| |\ | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/1291294 Change-Id: Ifc59b3559529fe64014ba9015348169e54b4444f
| | * Merge changes from topic "no-platform-app-glue"Orion Hodson2020-06-033-1/+3
| | |\ | | | | | | | | | | | | | | | | | | | | * changes: Don't build platform variants. Add dependency on jni_headers
| | | * Don't build platform variants.Dan Albert2020-05-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These depend on native_app_glue, which doesn't have a platform variant. Test: treehugger Bug: 152482542 Change-Id: I5f3d9b27dc3911af6d96b77afd4aacef305f93f1 Merged-In: I5f3d9b27dc3911af6d96b77afd4aacef305f93f1 (cherry picked from commit 4184e3e7444186c1cd952b3c5d9ac3b14e1523c9)
* | | | Add dependency on jni_headers am: f3e035aa4a am: 7a43d7533fOrion Hodson2020-06-032-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/1318896 Change-Id: I98109383fbd5b5a28ea023d8ac4445341a164068
| * | | Add dependency on jni_headers am: f3e035aa4aOrion Hodson2020-06-032-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/1318896 Change-Id: I6daa92a607304f6922184dc7c15d18df5b4543bc
| | * Add dependency on jni_headersOrion Hodson2020-05-272-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparation for removing implicit include paths for jni.h from soong. Remove unneeded jni.h include from main.cpp. Bug: 152482542 Test: Apply pending soong change and m checkbuild Change-Id: I42147c1a37a748a9a685639e3cf768647992dc94 Merged-In: I42147c1a37a748a9a685639e3cf768647992dc94 Exempt-From-Owner-Approval: build clean-up (cherry picked from commit d654b0d9ea687a835bc10905d41657733f55acff)
* | | Don't build platform variants.Dan Albert2020-05-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These depend on native_app_glue, which doesn't have a platform variant. Test: treehugger Bug: 152482542 Change-Id: I5f3d9b27dc3911af6d96b77afd4aacef305f93f1 Merged-In: I5f3d9b27dc3911af6d96b77afd4aacef305f93f1 (cherry picked from commit 4184e3e7444186c1cd952b3c5d9ac3b14e1523c9) Exempt-From-Owner-Approval: build change
* | | [automerger skipped] Use libnativewindow for platform variant of libagq am: ↵Colin Cross2020-05-020-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57155bd1ba -s ours am skip reason: Change-Id Ife99745fbb57c1d85241cf95c3a9767589d97f46 with SHA-1 1b730a2bb5 is in history Change-Id: Id5ab3ab3c189f3cd1d802f7e68f8adecd08c65fd
| * | | Use libnativewindow for platform variant of libagqandroid11-devColin Cross2020-04-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDK variant of libagq doesn't need libnativewindow as that library didn't exist in sdk version 26, but it is necessary for the platform variant. Bug: 149591340 Test: m checkbuild Change-Id: Ife99745fbb57c1d85241cf95c3a9767589d97f46 Merged-In: Ife99745fbb57c1d85241cf95c3a9767589d97f46 (cherry picked from commit 1b730a2bb59901c6bfd590421dd1d4f82f7a945e)
* | | | [automerger skipped] Test removing the unexpected runner from device-tests ↵Julien Desprez2020-04-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e921e32e7b -s ours am skip reason: Change-Id Ia3196ffadd21cfc32d67afa56709a80c9b066dc5 with SHA-1 e70a5e00f6 is in history Change-Id: Ifa41f34272aba4ae5a44b54b3402db3069bdac69
| * | | Test removing the unexpected runner from device-testsJulien Desprez2020-04-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: make Bug: 150008527 Change-Id: Ia3196ffadd21cfc32d67afa56709a80c9b066dc5 Merged-In: Ia3196ffadd21cfc32d67afa56709a80c9b066dc5
* | | | Add explicit dependencies on jni_headers am: 86d9a592ed am: 9b123643c1Orion Hodson2020-04-144-1/+3
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I535e1383e924ef44e70c27de1786e2089b1d321a
| * | | Add explicit dependencies on jni_headers am: 86d9a592edOrion Hodson2020-04-144-1/+3
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I45b19a32b1218d4030b5578fc592b17a248ba97d
| | * | Add explicit dependencies on jni_headersOrion Hodson2020-04-134-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparation for removing implicit include paths for jni.h from soong. Also remove unneeded #include jni.h from agq.h. Bug: 152482542 Test: m checkbuild Change-Id: I19985049b6868af237702fc177d050eef284862e
* | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 81a6c2ae58 -s ours am skip reason: subject contains skip directive Change-Id: Ieaa40edf579a5b45365f241894935e1196919e79
| * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I564c5a22a767af939e13c7e9b9dc9b146193a173
| | * \ \ Revert^2 "Use libnativewindow for platform variant of libagq" am: 993887f5ae ↵Colin Cross2020-04-081-1/+5
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | am: 1af00b8519 Change-Id: Ifca5701bbd9b83b5c463969daf5db6234aa17bbe
| | * | | Revert "Use libnativewindow for platform variant of libagq" am: 9b2aef4ea3 ↵Colin Cross2020-04-071-5/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4f7c338315 Change-Id: Id47fa64c1c870280613c820c9030fdba65bb357e
| | * \ \ \ Use libnativewindow for platform variant of libagq am: 1b730a2bb5 am: d4f697ee5bColin Cross2020-04-071-1/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I522e78911e5fe78168326f12019d40ddcc5da670
| | * \ \ \ \ DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li2020-03-190-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 2dab0f2e9a Change-Id: Ia67efa6284c56328582f16e93bc79c7513fa0d8a
* | | | | | | | Revert^2 "Use libnativewindow for platform variant of libagq" am: 993887f5ae ↵Colin Cross2020-04-081-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1af00b8519 Change-Id: I73253867ddf9c7ee963616afc938fe7567c021ca
| * | | | | | | Revert^2 "Use libnativewindow for platform variant of libagq" am: 993887f5aeColin Cross2020-04-081-1/+5
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | Change-Id: I118c1719c2f6d524341877f140993b67f1a9d995
| | * | | | | Revert^2 "Use libnativewindow for platform variant of libagq"Colin Cross2020-04-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b2aef4ea3c71555c174183786602023fe7a69ef Change-Id: Idb663296aeaa8e3ec3544700330c025820279033
* | | | | | | Revert "Use libnativewindow for platform variant of libagq" am: 9b2aef4ea3 ↵Colin Cross2020-04-071-5/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4f7c338315 Change-Id: I3f772d0c84ae83ea3714f8e53946501cdd805288
| * | | | | | Revert "Use libnativewindow for platform variant of libagq" am: 9b2aef4ea3Colin Cross2020-04-071-5/+1
| |\| | | | | | | |_|_|/ / | |/| | | | | | | | | | Change-Id: Ief3c033f84363533ad25b490f2fdaa392c41db06
| | * | | | Revert "Use libnativewindow for platform variant of libagq"Colin Cross2020-04-071-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Fix static dependency on libprotobuf-cpp-lite-ndk" Revert "Use stl to depend on libc++" Revert "Use libnativewindow for platform variant of libRSSupport" Revert "Use libnativewindow for platform variant of android_nati..." Revert "Set sdk_version for cc_genrules used by modules with sdk..." Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..." Revert "Add sdk mutator for native modules" Revert submission 1242911-sdk_version_variant Reason for revert: b/153394225 Reverted Changes: Ife99745fb:Use libnativewindow for platform variant of libagq... I1bae84c43:Use libnativewindow for platform variant of androi... I6e6021ed3:Use stl to depend on libc++ Ife99745fb:Use libnativewindow for platform variant of libRSS... I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi... I7d72934aa:Add sdk mutator for native modules Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE... Bug: 149591340 Change-Id: I7d8969f1c877622e59918db0c1873b9922cdd2f6 Fixes: 153394225
* | | | | | Use libnativewindow for platform variant of libagq am: 1b730a2bb5 am: d4f697ee5bColin Cross2020-04-071-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa7c40521fbc3130b475ce63735c5a48363e88e4
| * | | | | Use libnativewindow for platform variant of libagq am: 1b730a2bb5Colin Cross2020-04-071-1/+5
| |\| | | | | | |_|/ / | |/| | | | | | | | Change-Id: I5e3711cb8051680173d70fc82e2a02c0dc3b5617
| | * | | Use libnativewindow for platform variant of libagqColin Cross2020-03-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDK variant of libagq doesn't need libnativewindow as that library didn't exist in sdk version 26, but it is necessary for the platform variant. Bug: 149591340 Test: m checkbuild Change-Id: Ife99745fbb57c1d85241cf95c3a9767589d97f46
* | | | | [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 2dab0f2e9a -s ours am skip reason: subject contains skip directive Change-Id: Ie2c99b31b59c62df1da141df81483a3bee1f1f3c
| * | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | Bug: 151763422 Change-Id: I1fd2a624b2a831048656727e8d48ee817e9cc765
| | * | Test removing the unexpected runner from device-tests am: e70a5e00f6 am: ↵Automerger Merge Worker2020-02-251-4/+0
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | 98bafdf921 Change-Id: I233cd7a5307f08804dc8eff4ccaf5d77ae21fccf
* | | | Test removing the unexpected runner from device-tests am: e70a5e00f6 am: ↵Automerger Merge Worker2020-02-251-4/+0
|\| | | | |_|/ |/| | | | | | | | | | | 98bafdf921 Change-Id: Iba5b4b59a39ab04f91dfb9d698313f6da4ccc047
| * | Test removing the unexpected runner from device-tests am: e70a5e00f6android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker2020-02-251-4/+0
| |\ \ | | | | | | | | | | | | Change-Id: Iba409f1f06f849c888a45e2dc030ca9e6fbab712
| | * | Test removing the unexpected runner from device-testsJulien Desprez2020-02-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Test: make Bug: 150008527 Change-Id: Ia3196ffadd21cfc32d67afa56709a80c9b066dc5
* | | | Rely on the build system to know how to pack relocations. am: 66207e6d0c am: ↵Automerger Merge Worker2020-01-302-2/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | de7d214074 am: 398e2195ea Change-Id: Ie7664a70e61117bd76fbf89a5baa418f7bc6e9d6
| * | | Rely on the build system to know how to pack relocations. am: 66207e6d0c am: ↵Automerger Merge Worker2020-01-302-2/+0
| |\| | | | | | | | | | | | | | | | | | | | | | de7d214074 Change-Id: Ia08dc3bc2c3dc037f2cb0a98a0ffb5840991ba68
| | * | Rely on the build system to know how to pack relocations. am: 66207e6d0cAutomerger Merge Worker2020-01-302-2/+0
| |/| | | | |/ | | | | | | Change-Id: I6750098a42b736c707652172cca60b9cf7c2db75
| | * Rely on the build system to know how to pack relocations.android-r-preview-1Elliott Hughes2020-01-292-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The build system was broken at the time this workaround was added, but was fixed shortly afterwards as part of http://b/119086751. Bug: http://b/147452927 Test: treehugger Change-Id: If6776fe3a696b2e5aa17f61c74e820f60c008193
* | | Move final method to base class am: 146c1e98ff am: 7988dcd5ab am: f5940b646eAutomerger Merge Worker2019-12-141-35/+1
|\| | | | | | | | | | | Change-Id: Id0444721d90a8e025ce6bf0feed2b8f587f492ba
| * | Move final method to base class am: 146c1e98ff am: 7988dcd5abAutomerger Merge Worker2019-12-141-35/+1
| |\ \ | | | | | | | | | | | | Change-Id: I56b484e5a666d6b62efd220b46e4cc8952fbcbe5
| | * | Move final method to base classJulien Desprez2019-12-131-35/+1
| | |\| | | | | | | | | | | | | | | | | | | | | am: 146c1e98ff Change-Id: I33d398c5105fd3e598c1c8a65b2a078f4ee3f4bb
| | | * Move final method to base classJulien Desprez2019-12-131-35/+1
| | | | | | | | | | | | | | | | | | | | | | | | Test: build Bug: 146180028 Change-Id: I6f7cb342336b24f971a87027b5935b9fcf5e204c
* | | | Merge "Wait for starting logcat on testMemoryAllocationLimit" am: e88b5ea981 ↵Automerger Merge Worker2019-12-111-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | am: 4278857cef am: f972c913d7 Change-Id: Id995a496bee71aab02b5a3ca15f11d3fef2548e5
| * | | Merge "Wait for starting logcat on testMemoryAllocationLimit" am: e88b5ea981 ↵Automerger Merge Worker2019-12-111-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | am: 4278857cef Change-Id: Ib61d65f8ef11e1dfb4a20790e796b6a2a39a0ff2
| | * | Merge "Wait for starting logcat on testMemoryAllocationLimit"Koji Fukui2019-12-111-0/+7
| | |\| | | | | | | | | | | | | | | | | | | | | am: e88b5ea981 Change-Id: I1581717e17db241dd324e13f5d76b77e8314d8aa
| | | * Merge "Wait for starting logcat on testMemoryAllocationLimit"Treehugger Robot2019-12-111-0/+7
| | |/|
| | | * Wait for starting logcat on testMemoryAllocationLimitKoji Fukui2019-12-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symptom: MemoryTests#testMemoryAllocationLimit is sometimes failed if allocstress is finished within 5 seconds. Root cause: NativeDevice waits 5 seconds before starting logcat. So if allocstress is finished within 5 seconds on testMemoryAllocationLimit, the test can't take any logcat from the Device object and it is failed. Solution: Wait 5 seconds when testMemoryAllocationLimit starts taking logcat from NativeDevice. Bug: 145560218 Change-Id: If3cc34f2a79444967b1e3ec18860d1cf32bce8a6
* | | | [automerger skipped] DO NOT MERGE - ↵Xin Li2019-10-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2cfd7980e9 am: 3e1dbc42a6 -s ours am skip reason: subject contains skip directive Change-Id: I8528b1b275f8091bd066859113615485a4f7f260
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-07 12:52:28 +0000