aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add visibility: to limit access to lua.HEADmasterElliott Hughes2020-09-111-0/+1
| | | | | | | | lua was only approved for this specific use, so try to prevent folks unknowingly adding extra dependencies on it. Test: treehugger Change-Id: I52ca509dfbc50851993f78eef008ea456296ff26
* Merge Android RXin Li2020-09-081-0/+5
|\ | | | | | | | | | | Bug: 168057903 Merged-In: I3d367a3babc9cb7ac6dbea396f70e10c5651d50b Change-Id: I014692bdf83a0cdc7d5eeabb0747538c3eb798bc
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-271-0/+5
|/| | | | | | | | | | | Bug: 166295507 Merged-In: Ic74a2773a0813d4d85113ad91ecc5df7f9ce140b Change-Id: I3d367a3babc9cb7ac6dbea396f70e10c5651d50b
| * Set apex_available property am: 149d81183cJiyong Park2020-05-131-0/+5
| |\ | | | | | | | | | Change-Id: Ic74a2773a0813d4d85113ad91ecc5df7f9ce140b
| | * Set apex_available propertyandroid11-devJiyong Park2020-04-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Bug: 150999716 Test: m Change-Id: I7abed722266cbe04e862508a6ee7f745dd807e8f
| * | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 81fe03fc67 -s ours am skip reason: subject contains skip directive Change-Id: If2d8e9aebdb8a6157869b03cc21e62ac705b220a
| * \ \ Remove redundant NOTICE symbolic link. am: c35b8cc3f0 am: 260fcb759cBob Badour2020-03-271-1/+0
| |\ \ \ | | |_|/ | |/| | | | | | Change-Id: I7edd2954403e2a2c4e1925430c634c80d48e18b5
| * | | [automerger skipped] DO NOT MERGE - ↵Xin Li2019-10-300-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 6aa88f805f am: 14d22e8bef -s ours am skip reason: subject contains skip directive Change-Id: Ic432a1f1ea46f1becbc1df1a140af285d42d9c8d
| * \ \ \ Skip QD1A.190821.011 in stage-aosp-master am: 781d8c3841 am: 3aa9d884a9Xin Li2019-10-160-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 346538c1de Change-Id: Id767bc3661f551f4b151c15a94bde6d8cacf2e1f
| * \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 9e4f79f5ff -s ours am: 67f647ee7a -s ours am: fc75a8f484 -s ours am skip reason: change_id I0cddc58644ab80a4e10b52d9df8c7ecdecce2519 with SHA1 8338a4e720 is in history Change-Id: I448a30cc3d51c9531ef9ee987cc46c8a3a2ec305
| * \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li2019-09-050-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8338a4e720 -s ours am: 664a3b0e6f am: b82fd0c2ef am: 96b4cc9415 -s ours am skip reason: subject contains skip directive Change-Id: I8fdc90a0025b9016ba3abbfcc9733977ba6bd9cc
| * \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li2019-07-020-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5699924) into stage-aosp-master am: cfc63bdb42 am: b286be1e1e -s ours am skip reason: subject contains skip directive Change-Id: I22cdb370f766a97959fcfd929af4671ca5b55024
| * \ \ \ \ \ \ \ Use NDK to build liblua am: 0c69dfe33c am: ad594134e6 am: 92dc04595aTony Mak2019-06-141-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ed865be4d6 Change-Id: I643111b8f0c27166d45213b9dceb769263256112
| * \ \ \ \ \ \ \ \ [automerger skipped] Add liblua build target am: a2c7b2e933 am: 94bc4fcb5f ↵Tony Mak2019-06-140-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: ac4fd8238e -s ours am: 3152bb753b -s ours am skip reason: change_id I5ebb3ef39d81e70a1a1afc95c167c02f3ec16fd9 with SHA1 9cca8dd332 is in history Change-Id: I2aaaef8d92887f98c54f10c2df569b059b034f92
| * \ \ \ \ \ \ \ \ \ Fix glob syntax am: 9cca8dd332 am: 0ea93ca66bColin Cross2019-05-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c7c39ca1c1 Change-Id: I38137fe9a42f9d43f561e75cf831066e2afc6326
| * \ \ \ \ \ \ \ \ \ \ Fix glob syntax am: 9cca8dd332 am: 079c559830Colin Cross2019-05-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2762fc302e Change-Id: I87cf00b22618013bc1a4afdffc612e9fd4c8da16
* | \ \ \ \ \ \ \ \ \ \ \ Upgrade to lua 5.4.0. am: 3d75592d65Elliott Hughes2020-08-0771-6622/+12329
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1392002 Change-Id: I997270324df28c1040a36fc102938882ea2250a3
| * | | | | | | | | | | | Upgrade to lua 5.4.0.Elliott Hughes2020-08-0571-6622/+12329
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: treehugger Change-Id: I14a181b5f9633b6d59b2d3f891aa97aa67a1cd21
* | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li2020-04-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: Idf5a58eaf38cb6211abc16c53b926c69102f3269
| * | | | | | | | | | | Remove redundant NOTICE symbolic link. am: c35b8cc3f0 am: 260fcb759cBob Badour2020-03-271-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | Change-Id: I3d512095cc306baf168c55aa61cfb7ed6a14158a
* | | | | | | | | | | Remove redundant NOTICE symbolic link. am: c35b8cc3f0Bob Badour2020-03-271-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | Change-Id: Ie489628159f6d47d5c1052a58385f9152900c2b8
| * | | | | | | | | | Remove redundant NOTICE symbolic link.Bob Badour2020-03-251-1/+0
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I86e19454aac8600cd7cbcc1444ebdf9280fe1817
* | | | | | | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 6aa88f805f Change-Id: I6725f2e13158dfd63d19f48a1e9049dea506d43f
| * | | | | | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: Id7d282e1751ac15da5fd773922b769d7b898e822
* | | | | | | | | | Skip QD1A.190821.011 in stage-aosp-master am: 781d8c3841Xin Li2019-10-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3aa9d884a9 Change-Id: I6f0d0a703b6e8283a39dd4063ead884d31f124ca
| * | | | | | | | | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 781d8c3841 Change-Id: I0a4e41796328688b00db0a706bb9502c2b78e6e3
| | * | | | | | | | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-160-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 141248619 Change-Id: Idd685c4d36a010eaf58864bac4a76d6caf490f90
| | | * \ \ \ \ \ \ \ Snap for 5606075 from 0ea93ca66bd2cedd167404e13843895042a7b3e6 to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot2019-05-251-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-c2f2-release Change-Id: Ic273c580c9824e4b6bea40d18bc971d97b774b35
* | | | | | | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
|\| | | | | | | | | | | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 9e4f79f5ff -s ours am: 67f647ee7a -s ours am skip reason: change_id I0cddc58644ab80a4e10b52d9df8c7ecdecce2519 with SHA1 8338a4e720 is in history Change-Id: I48b22c6b9fe5e8bf4559bea03549a12adf7167e7
| * | | | | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 9e4f79f5ff -s ours am skip reason: change_id I0cddc58644ab80a4e10b52d9df8c7ecdecce2519 with SHA1 8338a4e720 is in history Change-Id: I0c7eeef2ca93d9b57b47ac7a06110889bd743a0c
| | * | | | | | | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No content change. Bug: 135460123 Change-Id: I54807f3ff5722d00389495e46d745c6f1d4779ec Merged-In: I0cddc58644ab80a4e10b52d9df8c7ecdecce2519
* | | / | | | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li2019-09-050-0/+0
|\| | | | | | | | | | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8338a4e720 -s ours am: 664a3b0e6f am: b82fd0c2ef Change-Id: Id60ebc6bd46a11f377019dd6ae2f73f5583733f4
| * | | | | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li2019-09-050-0/+0
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8338a4e720 -s ours am: 664a3b0e6f Change-Id: I9c546cfb9899a82d681d37f7f0d08058762beec9
| * | | | | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8338a4e720 -s ours am skip reason: subject contains skip directive Change-Id: Ibfaf30555e9f51eca7976c1dd83c3dd4a1def579
| | * | | | | | | DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li2019-09-041-1/+1
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 139893257 Change-Id: I0cddc58644ab80a4e10b52d9df8c7ecdecce2519
* | | | | | | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-020-0/+0
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: cfc63bdb42 Change-Id: Ib4acc8e79160e6e23637f7efb90dae6a2a32ee51
| * | | | | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-011-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 134405016 Change-Id: I9a39716e91c7e90cdd868559b2805d054417f7d8
* | \ \ \ \ \ \ \ Use NDK to build liblua am: 0c69dfe33c am: ad594134e6Tony Mak2019-06-141-0/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | am: 92dc04595a Change-Id: Ie6894dfdd067bbe5a9463d5db1572fa8dd4a08eb
| * | | | | | | Use NDK to build liblua am: 0c69dfe33cTony Mak2019-06-141-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ad594134e6 Change-Id: I91aca957943e79a7ba04ecc1121cced0093ec3bd
| | * | | | | | Use NDK to build libluaTony Mak2019-06-141-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0c69dfe33c Change-Id: I00c612eef4aa80d626a3efb94367a6a3d67bfca7
| | | * | | | | Use NDK to build libluaTony Mak2019-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 135110855 Test: m liblua Change-Id: I69afeb6f9a8c2afd62f4a0a4c8ed1d5e79cf0d86
* | | | | | | | [automerger skipped] Add liblua build target am: a2c7b2e933 am: 94bc4fcb5f ↵Tony Mak2019-06-140-0/+0
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: ac4fd8238e -s ours am skip reason: change_id I5ebb3ef39d81e70a1a1afc95c167c02f3ec16fd9 with SHA1 9cca8dd332 is in history Change-Id: Ia26f854d4ed5520aec413c173f02ec69938d7925
| * | | | | | [automerger skipped] Add liblua build target am: a2c7b2e933Tony Mak2019-06-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 94bc4fcb5f -s ours am skip reason: change_id I5ebb3ef39d81e70a1a1afc95c167c02f3ec16fd9 with SHA1 9cca8dd332 is in history Change-Id: I6887912d1c99b988fa1f646a7b6a8d73e9aac31d
| | * | | | | Add liblua build targetTony Mak2019-06-141-0/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a2c7b2e933 Change-Id: Id826bf2814792cd3aa2013a5faeb156b17cb20b4
| | | * | | | Add liblua build targetTony Mak2019-06-141-0/+42
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port by internal master. Bug: 135110855 Merged-in: I5ebb3ef39d81e70a1a1afc95c167c02f3ec16fd9 Test: m liblua Change-Id: Ie22b9f5293204dca07ba2d9d635f285a03bd1ccb
* | | | | | Fix glob syntax am: 9cca8dd332Colin Cross2019-05-230-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | | | | | | | am: 0ea93ca66b Change-Id: I9743da1c76745a60d0c7e14a812c67cd3efab530
| * | | | Fix glob syntaxandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseColin Cross2019-05-221-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | am: 9cca8dd332 Change-Id: I8c8b4c659d6c6a5f37256c5ed56d03adf6b3cbd6
* | | | | Fix glob syntax am: 9cca8dd332Colin Cross2019-05-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | am: 079c559830 Change-Id: I26238d183df519b0862c483391f75f99d04e90e9
| * | | Fix glob syntaxColin Cross2019-05-221-1/+1
|/| | | | |/ / | | | | | | | | | | | | am: 9cca8dd332 Change-Id: If26daa8ca1075d0892b16a81563c19248cbd9d5d
| * / Fix glob syntaxandroid10-devColin Cross2019-05-221-1/+1
|/ / | | | | | | | | | | | | | | | | Globs are only intended to support ** as a directory, i.e. **/*.cc not **.cc. Bug: 129411151 Test: m nothing Change-Id: I5ebb3ef39d81e70a1a1afc95c167c02f3ec16fd9