Commit Graph

42000 Commits

Author SHA1 Message Date
Elliott Hughes 2f5404be70 Merge "Remove obsolete (and broken) targets."
am: 388f1458a5

Change-Id: I1bb73047e1523b3f06252517f8bcad8cf0f28bee
2018-04-21 11:02:49 -07:00
Elliott Hughes 388f1458a5 Merge "Remove obsolete (and broken) targets." 2018-04-21 17:51:00 +00:00
Pirama Arumuga Nainar 5a1598938f Remove obsolete (and broken) targets.
Bug: N/A
Test: N/A
Change-Id: I461e1adae9c0fec026f05cb890af2c4d8bd71e58
2018-04-20 15:18:22 -07:00
Tao Bao d69c274920 Merge "releasetools: Stop copying images from RADIO/ to IMAGES/."
am: f7501cce04

Change-Id: Iadff85c17e9e1b10bed097c276a7a6ea972cfbdf
2018-04-20 14:27:16 -07:00
Nelson Li 30bdb776e2 Merge "build/make: auto generate Test config file for Google Benchmark Test"
am: 2338a70f90

Change-Id: Ia6cf2b31dfc34f41412072f291f0c01a4ebb1966
2018-04-20 14:23:29 -07:00
Tao Bao f7501cce04 Merge "releasetools: Stop copying images from RADIO/ to IMAGES/." 2018-04-20 21:20:47 +00:00
Treehugger Robot 2338a70f90 Merge "build/make: auto generate Test config file for Google Benchmark Test" 2018-04-20 21:16:00 +00:00
Tao Bao 5277d1015f releasetools: Stop copying images from RADIO/ to IMAGES/.
We've added support in brillo_update_payload that allows additionally
looking for images under RADIO/ in the given target_files zips [1]. This
avoids having duplicate radio images in target_files zips.

Also adjust the unittest in test_ota_from_target_files.py to cover this
path.

As a result of this CL, the radio images will no longer appear in the
image archive (i.e. <target>-img.zip) as well - they are less useful
anyway because we have packed only the _updatable_ pieces that are part
of full bootloader/radio images.

Bug: 77218220
Test: `python -m unittest test_ota_from_target_files`
Test: `python -m unittest test_add_img_to_target_files`
Test: `m dist` produces the same full OTA package
Test: Build marlin-userdebug in internal branch. Check the image zip.
Change-Id: I05579480f0bb9ab90aaeecf75969ee29b6904ad6
2018-04-20 10:20:42 -07:00
Anton Hansson 480e125b58 Merge "Add support for specifying LOCAL_SDK_LIBRARIES for prebuilts."
am: 4ad0be36e3

Change-Id: I83d4a9167ae5a79acb39913c16979efe01a8b58c
2018-04-20 01:27:44 -07:00
Anton Hansson 4ad0be36e3 Merge "Add support for specifying LOCAL_SDK_LIBRARIES for prebuilts." 2018-04-20 08:17:20 +00:00
Colin Cross f773cb3c69 Merge "Fix echo when copying package-res.apk"
am: f4b893165d

Change-Id: I4b3deade0c777290346a3054bf4a2ecc541db241
2018-04-19 18:35:22 -07:00
Colin Cross f4b893165d Merge "Fix echo when copying package-res.apk" 2018-04-20 01:21:49 +00:00
Colin Cross a90f4b297f Fix echo when copying package-res.apk
Bug: 73724997
Test: m checkbuild
Change-Id: Iad9f46e01c40d1993e279c6ea6dd9c60932064c8
2018-04-19 15:28:59 -07:00
Dan Shi b5fd7133ae Merge "Allow tests to be disabled for presubmit check"
am: 4c7d849a1b

Change-Id: I0bf781e9ea13c7325b35631e369834acf47d3c77
2018-04-19 14:07:45 -07:00
Treehugger Robot 4c7d849a1b Merge "Allow tests to be disabled for presubmit check" 2018-04-19 20:43:54 +00:00
Chih-hung Hsieh 1ada03ec15 Merge "When my_use_clang_lld, link with lld for host."
am: 00ca2ecdcf

Change-Id: I016d02082f451f4c0e82c2be6d4cc94b1e2ab108
2018-04-19 10:12:01 -07:00
Chih-hung Hsieh 00ca2ecdcf Merge "When my_use_clang_lld, link with lld for host." 2018-04-19 17:03:02 +00:00
Anton Hansson f5cefdcefb Add support for specifying LOCAL_SDK_LIBRARIES for prebuilts.
This new variable allows specifying libraries like this:
LOCAL_SDK_VERISON := 25
LOCAL_SDK_LIBRARIES := org.apache.http.legacy,
which would automatically pick up the prebuilt OAHL prebuilt
from prebuilts/sdk/25/public/org.apache.http.legacy.jar

Test: In master with uiautomator.
Bug: 77575476
Change-Id: Id8d92176f5b608c2bcea622b6aed4aa27c32e000
2018-04-19 15:18:55 +01:00
Nelson Li eec9529de8 build/make: auto generate Test config file for Google Benchmark Test
BUG: 74844131
Test: cd bionic/; mm (auto generating the test config in out/)
      atest bionic-benchmarks (full testing in atest)
Change-Id: I0497eed876640893d0b82d4cde384d3608cf4875
2018-04-19 09:16:54 +00:00
Anton Hansson 424ee8d748 Merge "Switch make over to use the new prebuilt modules."
am: 2944c11b1f

Change-Id: Ia2035f6c06ade38e39ce46b00ef3c7c415403a46
2018-04-19 01:56:52 -07:00
Anton Hansson 2944c11b1f Merge "Switch make over to use the new prebuilt modules." 2018-04-19 08:48:29 +00:00
Colin Cross 733057f12f Merge "Pass PLATFORM_VERSION_CODENAME to Soong"
am: 7c84a01daf

Change-Id: Iaa00e13fb0ae4db8335fb7d9bdaa8a0441e7a96d
2018-04-18 15:32:03 -07:00
Colin Cross 7c84a01daf Merge "Pass PLATFORM_VERSION_CODENAME to Soong" 2018-04-18 22:22:25 +00:00
Tao Bao cd64a00c03 Merge "Remove the support for BRILLO_VENDOR_PARTITIONS."
am: c904a89c93

Change-Id: I01954da183db919d558a45eb00d12691e24a8237
2018-04-18 14:48:18 -07:00
Treehugger Robot c904a89c93 Merge "Remove the support for BRILLO_VENDOR_PARTITIONS." 2018-04-18 21:32:35 +00:00
Colin Cross f6d3fff907 Pass PLATFORM_VERSION_CODENAME to Soong
Pass PLATFORM_VERSION_CODENAME as Platform_sdk_codename, and
set Platform_sdk_final if PLATFORM_VERSION_CODENAME is REL.

Bug: 78224641
Test: m checkbuild
Change-Id: Ic082ca756d877ba51f45e89aa2ac267781a8d854
2018-04-18 12:40:16 -07:00
Tao Bao 36d7c5666d Remove the support for BRILLO_VENDOR_PARTITIONS.
It was initially introduced in commit
2e735ca34e, where it packs additional
vendor images into target_files zip in order to generate OTAs. We can
acheive the same goal with INSTALLED_RADIOIMAGE_TARGET, which is the way
being actively used across all targets, including IoT (the former
Brillo) targets.

Bug: 78201540
Test: `m dist` with aosp_marlin-userdebug
Test: Code search shows no active user of BRILLO_VENDOR_PARTITIONS.
Test: `python -m unittest test_add_img_to_target_files`
Change-Id: I8803d5377b5a39304a701cceafb243f9a228347d
2018-04-18 09:50:47 -07:00
Anton Hansson 9235faa9a4 Switch make over to use the new prebuilt modules.
There are a couple more places throughout the tree that use the old
modules, and I will update those next before deleting the old module
definitions.

Bug: 77525052
Test: make droid
Change-Id: I9385ae34cc1646cbd4e249d9e96a0116296f139a
2018-04-18 16:15:05 +01:00
Chih-Hung Hsieh 4955b857c4 When my_use_clang_lld, link with lld for host.
When USE_CLANG_LLD is true, my_use_clang_lld is true,
and *GLOBAL_LLDFLAGS will be used instead of *GLOBAL_LDFLAGS.

Bug: 73768157
Test: make checkbuild
Change-Id: I2598b72e9edde32f8e57df860571fd107c005540
2018-04-17 15:30:24 -07:00
Dan Willemsen 1a9d3412a9 Merge "Don't use export with BUILD_ID"
am: d36cfa333a

Change-Id: I7d4dbc3433200e237995abb86d9ead97a150ab9e
2018-04-17 14:31:23 -07:00
Treehugger Robot d36cfa333a Merge "Don't use export with BUILD_ID" 2018-04-17 21:12:45 +00:00
Dan Shi 639c6ccf7a Allow tests to be disabled for presubmit check
A test can be disabled in two ways:
1. Add the test name to ALL_DISABLED_PRESUBMIT_TESTS variable.
   Integration tests (tests inside TradeFed) can only be disabled in
   this way.
2. In module config, set LOCAL_PRESUBMIT_DISABLED to true. This works
   for tests with build target.

This change allows tests to be skipped in presubmit check to be saved in
a list that's included in test-mappings.zip build artifact.

Bug: 74971025
Test: m dist -j test-mapping
Change-Id: I6e3016b017ce1ade024dc4ded72a10c778b88e7f
2018-04-17 12:07:31 -07:00
Søren Gjesse a246c6a84a Merge "Keep the collected Proguard configuration"
am: 0c2a796853

Change-Id: Icbaef8854a012366cb8cbe9d647065bd85962665
2018-04-17 00:08:36 -07:00
Søren Gjesse 0c2a796853 Merge "Keep the collected Proguard configuration" 2018-04-17 07:01:57 +00:00
Dan Willemsen b288560ae5 Merge "Mark version_defaults as readonly"
am: eec144223a

Change-Id: Iaf5ba2e0580826c88e0b9872a1130219e955c628
2018-04-16 20:13:37 -07:00
Treehugger Robot eec144223a Merge "Mark version_defaults as readonly" 2018-04-17 03:05:22 +00:00
Dan Willemsen 1f1e2e4eea Mark version_defaults as readonly
These shouldn't be changed by anyone after this point, and this will
prevent random Android.mk from re-including this file.

Test: m nothing
Test: failed on hikey w/o https://android-review.googlesource.com/662764
Change-Id: I7ba4db3594af5b18b98fafee81b64531a40df396
Merged-In: I7ba4db3594af5b18b98fafee81b64531a40df396
2018-04-17 01:30:08 +00:00
Nan Zhang 3a966b7247 Merge "Remove make/tools/droiddoc/test/stubs/Android.mk"
am: 2fb914c56b

Change-Id: Iae46af9305ae0d765133b30e8b63d0e1e2378be8
2018-04-16 16:40:35 -07:00
Treehugger Robot 2fb914c56b Merge "Remove make/tools/droiddoc/test/stubs/Android.mk" 2018-04-16 23:30:56 +00:00
Dan Willemsen b7b7a97c2c Don't use export with BUILD_ID
It's not necessary, and all the tools that read this file have been
updated.

Bug: 73959648
Test: cs for uses
Change-Id: Ic203e83ab437beecf07760660f2b3ac7c67e9ded
Merged-In: Ic203e83ab437beecf07760660f2b3ac7c67e9ded
2018-04-16 23:05:10 +00:00
Andreas Gampe 7033cc2c6f Merge "Revert "Build: Support for compiled-classes file""
am: 1cd44482db

Change-Id: I93c46ba84df49662ed161134f9b8b9ce406f8ac1
2018-04-16 11:07:26 -07:00
Treehugger Robot 1cd44482db Merge "Revert "Build: Support for compiled-classes file"" 2018-04-16 16:33:24 +00:00
Søren Gjesse 9fbdd9ec5a Keep the collected Proguard configuration
This will work for both R8 and Proguard

Test: m -j Settings && "manually check .../proguard_coniguration file"
Change-Id: I1da7c3426b3511e2d5ad69852da8cec3245d7e54
2018-04-16 09:16:35 +02:00
Chih-Hung Hsieh ffcdc18a8c Merge "Fix typo."
am: 5576f9a6ca

Change-Id: I1ed90064bdf8521f5049c21e244e101f27d8521e
2018-04-14 15:58:11 -07:00
Treehugger Robot 5576f9a6ca Merge "Fix typo." 2018-04-13 21:53:02 +00:00
Chih-Hung Hsieh d1caff4b2b Fix typo.
Bug: 73768157
Test: make checkbuild
Change-Id: Icf3a142500aa3f9849250ae0a895a61797b95376
2018-04-13 13:15:46 -07:00
Andreas Gampe 35ab4203ef Revert "Build: Support for compiled-classes file"
This reverts commit 96a522037f.

Bug: 76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
2018-04-13 13:08:13 -07:00
Chih-hung Hsieh db18e11b86 Merge "Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD"
am: a72e1518e7

Change-Id: I16b12fa2c788ffdf7c444de6112d110c7e3963e0
2018-04-13 12:36:35 -07:00
Chih-hung Hsieh a72e1518e7 Merge "Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD" 2018-04-13 19:26:04 +00:00
Justin Yun 471c65c820 Merge "Check vndk list on build"
am: 93dcc11c17

Change-Id: Ia48a3d2fcee06fbba0ab9e68cb91121c189f1e14
2018-04-13 00:28:12 -07:00