summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-06Merge "Remove our binary of ccache"android-o-mr1-iot-preview-8o-mr1-iot-preview-8Treehugger Robot
2018-04-05Remove our binary of ccacheDan Willemsen
This version is rather old, and has many known bugs. The build system is no longer providing ccache, but preserving the option to use your own at your own risk. Bug: 32748498 Test: cs/ccache Change-Id: I894a11445127bf8cb3a7ac5a119c500f2c572fb9
2018-02-23Merge "Remove unused icu4j prebuilt Android.bp"android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7Treehugger Robot
2018-02-23Remove unused icu4j prebuilt Android.bpNan Zhang
icu4j prebuilt is only used by ADT and layoutlib instead of our build system. icu4j has both prebuilt and src modules exist. When java library collect deps, its own prebuilt dependency goes to default which is panic error. Test: manual Change-Id: I77ea44c911a572b6f4882fa9c51d4090c918afa7
2018-02-15Merge "Fix link-type warnings on espresso-* prebult libs"Treehugger Robot
2018-02-14Fix link-type warnings on espresso-* prebult libsJiyong Park
The prebuilt libs are all marked with LOCAL_SDK_VERSION so that they don't trigger link-type check warning when they are used from a library or an app built with SDK. For example, espresso-core is built with SDK and using espresso-core-nodep and espresso-idling-resource-nodep, which causes link-type check warning. This warning will soon be error. Bug: 69899800 Test: mma -j under this directory. The build is successufl and does not show link-type check warning other than for tagsoup (which is currently being handled). Change-Id: I1a9d71405ab71901d454bb2fab651353ea9ea671
2018-01-10Merge "Remove bison prebuilts"android-wear-8.0.0_r1Dan Willemsen
2018-01-08Remove bison prebuiltsDan Willemsen
These have been replaced with newer versions in prebuilts/build-tools (including the data dir). Test: m Change-Id: I2ee965e027048e977a463abe2e32a21fa2b51150
2018-01-05Merge "Merge remote-tracking branch oreo-mr1-cts-dev into master."Treehugger Robot
2018-01-04Merge remote-tracking branch oreo-mr1-cts-dev into master.Xin Li
Test: presubmit Bug: 69859815 Change-Id: I1ffa3fedf870d2a0cebb6cd8ee5dd7dc5b168fe0
2018-01-03Merge "Export asm-6.0 as device modules"Colin Cross
2017-12-21Export asm-6.0 as device modulesColin Cross
jacocoagent unnecessarily includes asm, export the prebuilts as device modules for now. Bug: 69671801 Test: m checkbuild Change-Id: I1d9c9efc47100552b4ecdecea08cebb47c2c3937
2017-12-12Merge "Fix up intendation of PRIVATE_ROBOLECTRIC_SCRIPT."Treehugger Robot
2017-12-12Merge "Read shell's PATH rather than make's to avoid warning logspam."Treehugger Robot
2017-12-12Fix up intendation of PRIVATE_ROBOLECTRIC_SCRIPT.Tobias Thierer
Test: EXPERIMENTAL_USE_OPENJDK9=1.8 make \ RunSettingsLibRoboTests RunBluetoothRoboTests \ CarMessengerRoboTests RunEmergencyInfoRoboTests \ RunManagedProvisioningRoboTests PackageInstallerRoboTests \ RunSettingsRoboTests RunStorageManagerRoboTests Change-Id: I802a9056fd1abad387e3bc57cd57c0ef75765ec9
2017-12-12Read shell's PATH rather than make's to avoid warning logspam.Tobias Thierer
This applies the same change to AOSP's robolectric 3.1.1 as what another change with the same Change-Id already applied to internal versions of robolectric. Bug: 70518982 Test: Visual inspection of the change only. Ran test at subsequent CL. Change-Id: I491fede7f0a64e1da4e63052802fd153a8b76d3f Merged-In: I491fede7f0a64e1da4e63052802fd153a8b76d3f
2017-12-11Merge "Pin robotest-internal to OpenJDK 8."Tobias Thierer
2017-12-08Pin robotest-internal to OpenJDK 8.Tobias Thierer
AOSP bundles robolectric 3.1.1 and ASM 5; only robolectric 3.5.1 or later using ASM 6 or later can run under OpenJDK 9. Bug: 70286093 Test: EXPERIMENTAL_USE_OPENJDK9=1.8 make \ RunSettingsLibRoboTests RunBluetoothRoboTests \ CarMessengerRoboTests RunEmergencyInfoRoboTests \ RunManagedProvisioningRoboTests PackageInstallerRoboTests \ RunSettingsRoboTests RunStorageManagerRoboTests Change-Id: I0f2ab28cb41e34781c349f912743ad54d2c02ab3 Merged-In: I0f2ab28cb41e34781c349f912743ad54d2c02ab3
2017-12-06Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterXin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: Ic7e9b9b1c3e16d7adf081d6dc39eb6b274c30738
2017-12-04Merge "Update android-support-test prebuilts."Joachim Sauer
am: 7ce8e8df8d -s ours Change-Id: Ia7ba051e93b4015380830fa181dd9fc7c7e623c9
2017-12-04Merge "Update android-support-test prebuilts."Joachim Sauer
2017-12-01Update android-support-test prebuilts.Brett Chabot
This commit updates prebuilt jars with runner/rules 1.0.0 and espresso 3.0 from atsl_6.0_alpha_2 prerelease. Also removed the jars with bundled dependencies and replaced with list of dependent libraries. (cherry picked from commit 36872dd95ad73cdbd97948e7eb1006bb7002c32f) Test: make tests Bug: 69455082 Change-Id: Ic6a8897c363b739627d19a0cd217ddd232ee0f12 Merged-In: Ia6b2334a761186d19867b3dc1a289cef9901bee0
2017-11-22Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: ↵android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10oreo-mr1-vts-releaseoreo-mr1-cts-devIgor Murashkin
8d1bba5bee" am: 19bb72bb04 am: b98d4f052a -s ours Change-Id: If4c4f3fd932c9020d53f5f49252f3e852001575d
2017-11-22Merge "Revert "Merge "Update android-support-test prebuilts." into ↵Igor Murashkin
oreo-cts-dev"" am: a4fd30c653 -s ours Change-Id: I1e1191a6cd99a8b5086985df4234c12e5c67ed3f
2017-11-20Merge "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: ↵Tina Zhou
8d1bba5bee" am: 2fc8ea9897 -s ours Change-Id: If523203858a62d8c8002afcf931b92edf1200b5b
2017-11-20Merge "Update android-support-test prebuilts." into oreo-cts-dev am: ↵Tina Zhou
8d1bba5bee am: 248693fe30 am: 318c95c92b -s ours Change-Id: Ie4af68f5f326f86d44635a23a70f75b3bd05592c
2017-11-18Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: ↵Igor Murashkin
8d1bba5bee" am: 19bb72bb04 Change-Id: I586204a507c302321b3a39f423151bfec391da1b
2017-11-18Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: ↵Igor Murashkin
8d1bba5bee" This reverts commit 248693fe30e9e3a8b08fa4c1d2182b64c4e13ae0. This is breaking oc-dev and everything downstream. Change-Id: I060a9778ad0013d59662899ba7a354ba81c9ee9a
2017-11-18Merge "Revert "Merge "Update android-support-test prebuilts." into ↵android-o-mr1-iot-preview-6o-mr1-iot-preview-6Igor Murashkin
oreo-cts-dev""
2017-11-18Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev"Igor Murashkin
This reverts commit f0bcb1da1bad4a95fe19f6611efc2c2c0e90429e. Reason for revert: breaks a lot of builds Change-Id: I6ee4358adacd1425b259cf664ed600241da53aa1
2017-11-17Merge "Update android-support-test prebuilts." into oreo-cts-dev am: 8d1bba5beeTina Zhou
am: 248693fe30 Change-Id: Icedd377c2a018485fb239e8f2bf44723fbd997df
2017-11-17Merge "Update android-support-test prebuilts." into oreo-cts-devTina Zhou
am: 8d1bba5bee Change-Id: I729ecf4b100a1582ac8ac616e61d76250babb6fc
2017-11-17Merge "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: ↵Android Merger
8d1bba5bee"
2017-11-17Merge "Update android-support-test prebuilts." into oreo-cts-devTina Zhou
am: 8d1bba5bee Change-Id: I74c96829e3e2c6fa5800cf800718b157a5cd403a
2017-11-13Merge commit 'c6d82e9ac2281f6e59d599ce17593a868a035bde' into HEADXin Li
Change-Id: I059d500d436738e9ef7467a8308647bbbae8c672
2017-10-25Merge changes I1825d60e,Ie009a522Colin Cross
am: 8acfb0b3e1 Change-Id: I57e8c49d63ca879add9fe5c94c2f794869d88421
2017-10-25Merge changes I1825d60e,Ie009a522Treehugger Robot
* changes: Convert prebuilts/misc/common/commons-cli to Android.bp Revert "Add a LOCAL_MODULE to use commons-cli"
2017-10-24Convert prebuilts/misc/common/commons-cli to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: I1825d60ee9714d3be8a264c048962dd8c25498eb
2017-10-24Revert "Add a LOCAL_MODULE to use commons-cli"Julien Desprez
This reverts commit d1a10c6256dad692e6bdfcf8f2a7c1ab2779fe2b. Test: m checkbuild Change-Id: Ie009a522300274d0bfc9a9a0a2d09cc425dbe665 Merged-In: Ie009a522300274d0bfc9a9a0a2d09cc425dbe665 (cherry picked from commit 7ee67e342a7c4084c9627b578e05824dfd281f01)
2017-10-23Merge "Convert most of prebuilts/misc/common to Android.bp"Colin Cross
am: 47782c47c9 Change-Id: I84c7b9af23f6aba2771718fa88e5820f04c8911f
2017-10-23Merge "Convert most of prebuilts/misc/common to Android.bp"Treehugger Robot
2017-10-22Merge "Replace ASM 6.0_BETA with final release"Colin Cross
am: 893bb44728 Change-Id: I95f70f8aeb02a491b328c2aeded8809011ade285
2017-10-22Merge "Replace ASM 6.0_BETA with final release"Colin Cross
2017-10-21Convert most of prebuilts/misc/common to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: I8675267fdf6d0acced15c992d7ff6084463c33fa
2017-10-20Replace ASM 6.0_BETA with final releaseColin Cross
Test: m checkbuild Change-Id: Icaad17f2979607caaa5450e724bdb3e9163b19c9
2017-10-18Merge "Update android-support-test prebuilts." into oreo-cts-devoreo-cts-devTina Zhou
2017-10-07Merge "Convert args4j prebuilt to Android.bp" am: 68b778db59 am: 30844e7df0Colin Cross
am: 18c9a03009 Change-Id: I8c2e9f0d5363baa5aed77c014f1598c5143451f0
2017-10-07Merge "Convert args4j prebuilt to Android.bp" am: 68b778db59Colin Cross
am: 30844e7df0 Change-Id: I1da496d70e5ecf56574199112acf3993647c3a9b
2017-10-07Merge "Convert args4j prebuilt to Android.bp"Colin Cross
am: 68b778db59 Change-Id: I5864eea4a7dc146dd80130308c0802699fb29972
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 14:10:00 +0000