Commit Graph

42328 Commits

Author SHA1 Message Date
Justin Yun ffffefd791 Merge "Create firmware and persist in GSI for arm_ab" am: 19db058484
am: 308fbbdb54

Change-Id: Id8df567bb351cc02859055c10cf37a9c3f1c82fd
2018-02-27 00:20:00 +00:00
Justin Yun 308fbbdb54 Merge "Create firmware and persist in GSI for arm_ab"
am: 19db058484

Change-Id: I38a60d919880a2b7ca9f1544d02efd0dcd610203
2018-02-27 00:10:57 +00:00
Treehugger Robot 19db058484 Merge "Create firmware and persist in GSI for arm_ab" 2018-02-26 23:56:11 +00:00
Dan Shi 6dbd9e3df9 Merge "Default test to AndroidJUnitTest for auto-generated test config." am: ce1fa25d1b
am: d91129eea9

Change-Id: Ib0e817e8d403ea130516dbc94201fd4a899c327f
2018-02-26 23:18:57 +00:00
Justin Yun 38e934a38e Create firmware and persist in GSI for arm_ab
Some SoC vendors require firmware and persist directores to mount.
This must be provided in GSI for arm_ab not only for arm64_ab.
Once the directories are moved to /vendor, these policies for root
must be removed.

Bug: 36764215
Bug: 73720182
Test: GSI boot with 32bit devices
Change-Id: Ic5c6bb615c39853d51d233c00d2d9e8ee2c57802
2018-02-26 23:10:47 +00:00
Dan Shi d91129eea9 Merge "Default test to AndroidJUnitTest for auto-generated test config."
am: ce1fa25d1b

Change-Id: Icbc622f78eff0645272a8d10f0ec0a3ac6971ead
2018-02-26 23:10:22 +00:00
Treehugger Robot ce1fa25d1b Merge "Default test to AndroidJUnitTest for auto-generated test config." 2018-02-26 23:00:28 +00:00
Tao Bao ed98b94326 Merge "releasetools: Remove the parsing of META/imagesizes.txt." am: 3aee4dfac1
am: 72f3c44243

Change-Id: I83af79b6d5a76099259a951585d92755b132af9e
2018-02-26 22:39:14 +00:00
Tao Bao 72f3c44243 Merge "releasetools: Remove the parsing of META/imagesizes.txt."
am: 3aee4dfac1

Change-Id: If3606b3ebe8fe795748022634af7c1de8a621587
2018-02-26 22:32:09 +00:00
Tao Bao b8d0b5bd06 Merge "releasetools: Add unittests for GetCareMap() and AddCareMapTxtForAbOta()." am: 7998503ebe
am: 5fed709d60

Change-Id: I117d452b1a4d63b7665c3593b5b2167fe57be954
2018-02-26 22:24:13 +00:00
Treehugger Robot 3aee4dfac1 Merge "releasetools: Remove the parsing of META/imagesizes.txt." 2018-02-26 22:18:31 +00:00
Tao Bao 5fed709d60 Merge "releasetools: Add unittests for GetCareMap() and AddCareMapTxtForAbOta()."
am: 7998503ebe

Change-Id: I97f5e2da573d8448b8cd89655d1f5e570c0bf59c
2018-02-26 22:16:35 +00:00
Tao Bao 7998503ebe Merge "releasetools: Add unittests for GetCareMap() and AddCareMapTxtForAbOta()." 2018-02-26 22:06:32 +00:00
Bo Hu 6dc9db6051 Merge "emulator: remove opengles property" am: c187fdf751
am: 438eebab81

Change-Id: I5d616d60bb4e082d493fb66f49c4abfb0fcd7c64
2018-02-23 23:11:47 +00:00
Bo Hu 438eebab81 Merge "emulator: remove opengles property"
am: c187fdf751

Change-Id: I2947bfd0074f7edb427d96f3ac253f6183883f2b
2018-02-23 23:04:43 +00:00
Bo Hu c187fdf751 Merge "emulator: remove opengles property" 2018-02-23 22:50:08 +00:00
Tao Bao 41fb7d27cf releasetools: Remove the parsing of META/imagesizes.txt.
The file has been removed from target-files.zip since commit
c19a8d5590 (Gingerbread), whose info has
been consolidated into META/misc_info.txt.

Test: `m dist`
Change-Id: Ic144457954f5742ea082dcd9ffbea71df4afe46e
2018-02-23 12:06:07 -08:00
bohu 70fefe0066 emulator: remove opengles property
BUG: 73812167
Change-Id: I5bdc475c6bdd5bdcb32c5a12f49c18c6a391b95c
2018-02-23 09:08:45 -08:00
Nan Zhang b335c4a4f3 Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8
am: 7edfe29e8f

Change-Id: I1ef8af667a806ead8c4098bbdab12d377e8fd7b1
2018-02-22 23:11:08 +00:00
Nan Zhang 7edfe29e8f Merge "Export Make config vars to Soong to support Droiddoc"
am: 5d7ec6bdf8

Change-Id: I167b1ced44901589817262b5bb097648fe284968
2018-02-22 22:58:47 +00:00
Treehugger Robot 5d7ec6bdf8 Merge "Export Make config vars to Soong to support Droiddoc" 2018-02-22 22:11:07 +00:00
Tao Bao a5baf56e6c Merge "releasetools: Allow skipping postinstall hooks when generating A/B OTAs." am: 6c0ddf2480
am: ff1288821d

Change-Id: Iea818eb91dd5ff98d9b378a845ff507e1dee1e0c
2018-02-22 20:40:25 +00:00
Tao Bao ff1288821d Merge "releasetools: Allow skipping postinstall hooks when generating A/B OTAs."
am: 6c0ddf2480

Change-Id: I5f59aff4d91d98842d6e9f64d7d0dbbb05c37c4b
2018-02-22 20:32:34 +00:00
Tao Bao 6c0ddf2480 Merge "releasetools: Allow skipping postinstall hooks when generating A/B OTAs." 2018-02-22 20:21:36 +00:00
Tao Bao 894cba2954 Merge "releasetools: Check for duplicate entries in ReplaceCerts()." am: 8bfde7c5fb
am: 7032691417

Change-Id: Icc23606930f1a2f3e0009b1ec225723ffc8a7617
2018-02-22 17:57:03 +00:00
Tao Bao 7032691417 Merge "releasetools: Check for duplicate entries in ReplaceCerts()."
am: 8bfde7c5fb

Change-Id: Iacbcd97f246b499edc834fb23c45489ea0708a5e
2018-02-22 17:48:28 +00:00
Tao Bao 8bfde7c5fb Merge "releasetools: Check for duplicate entries in ReplaceCerts()." 2018-02-22 17:39:00 +00:00
Mathew Inwood 24b47e09ae Merge "Include hiddenapi-whitelist.xml in the build." am: b3d619f22d
am: cf68e9e8bd

Change-Id: I899ca99f960e450ada6f31a0707cf085d5021acd
2018-02-22 14:25:18 +00:00
Mathew Inwood cf68e9e8bd Merge "Include hiddenapi-whitelist.xml in the build."
am: b3d619f22d

Change-Id: I6df907d6487d1397d6c6e636477c09a268e98402
2018-02-22 14:08:52 +00:00
Mathew Inwood b3d619f22d Merge "Include hiddenapi-whitelist.xml in the build." 2018-02-22 12:57:48 +00:00
hansson 1f903cce0c Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." am: 3c76d02668
am: ab8f5d74f2

Change-Id: I46e339b3faf05092e01950ca702f11d647667d02
2018-02-22 11:53:50 +00:00
hansson ab8f5d74f2 Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS."
am: 3c76d02668

Change-Id: I6e0c617a1e6fc8300ca1e861612d2f32a066b63e
2018-02-22 11:45:43 +00:00
hansson 3c76d02668 Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." 2018-02-22 11:33:57 +00:00
Mathew Inwood 0874887627 Include hiddenapi-whitelist.xml in the build.
See I1cbbd220c61b1b4b767c301f97096607ee902a7b which introduces this file.

Test: see related change I1cbbd220c61b1b4b767c301f97096607ee902a7b

Merged-In: I23dba07a5d83e4325227892e0a11a758e093effa
Change-Id: I0030718b932ea588120492fd8bcab1f389a40324
2018-02-22 11:10:57 +00:00
Tao Bao 63c18fead8 releasetools: Add unittests for GetCareMap() and AddCareMapTxtForAbOta().
With test_utils.construct_sparse_image(), creating valid sparse image is
no longer a blocker for testing these functions.

Test: python -m unittest test_add_img_to_target_files
Change-Id: Iff1f15837cc744bad52e2120f9a9ad94d7db50d5
2018-02-22 00:10:05 -08:00
Nan Zhang 7e634580ba Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
am: 90b8d087e6

Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97
2018-02-22 02:29:18 +00:00
Nan Zhang 90b8d087e6 Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make."
am: d3bec931cd

Change-Id: I5783697afde068a1d77a9d9960554b29eab265a2
2018-02-22 02:21:13 +00:00
Treehugger Robot d3bec931cd Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." 2018-02-22 02:07:15 +00:00
Mathieu Chartier a6355cbc9b Merge "Add property for generating dm files" am: 3d2b45ad55
am: d8cb5746be

Change-Id: I6cee03620521d4846a23a6a65e413c484ad7ada3
2018-02-22 01:42:33 +00:00
Mathieu Chartier d8cb5746be Merge "Add property for generating dm files"
am: 3d2b45ad55

Change-Id: I1c22d41b70d3af9daf596a6e02346605a94950b7
2018-02-22 01:34:26 +00:00
Mathieu Chartier 3d2b45ad55 Merge "Add property for generating dm files" 2018-02-22 01:20:29 +00:00
Tao Bao 15a146a7c4 releasetools: Allow skipping postinstall hooks when generating A/B OTAs.
This CL adds a new flag '--skip_postinstall' that allows skipping all
the postinstall hooks when generating an A/B OTA package (default:
False). Note that this discards ALL the hooks, including non-optional
ones. Should only be used if caller knows it's safe to do so (e.g. all
the postinstall work is to dexopt apps and a data wipe will happen
immediately after).

Bug: 73547992
Test: python -m unittest test_ota_from_target_files
Test: Generate a full OTA package for walleye. Examine the generated
      payload.
Change-Id: Ifc069e897b4019605051eabfd221230a6a37867c
2018-02-21 16:34:19 -08:00
Nan Zhang 0abdb5811d Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Mathieu Chartier 5c658ac3a9 Add property for generating dm files
Added product property: PRODUCT_DEX_PREOPT_GENERATE_DM_FILES.
If this property is true, APKs compiled as verify will have the dex
files left compressed and the vdex put in a dm file. The vdex file
and oat files are not copied to system partition in this case.

Bug: 70934104
Test: manual

Change-Id: Ie137e14f14642b803a506162de6db8ac65a43f46
2018-02-21 13:50:21 -08:00
Dan Shi 96068b77ed Default test to AndroidJUnitTest for auto-generated test config.
All new instrumentation tests shall use AndroidJUnitRunner, thus default
test class to AndroidJUnitTest.

Bug: 73679956
Test: unittest
Change-Id: I52df4d01b8459a4a6e5c2cbe15973dab079fb136
2018-02-21 11:31:06 -08:00
Anton Hansson 7ff32d2734 Add support for LOCAL_PRIVATE_PLATFORM_APIS.
The only enforcement right now is that modules don't specify both
LOCAL_SDK_VERSION and LOCAL_PRIVATE_PLATFORM_APIS, but a warning
can be turned on by setting the JAVA_SDK_ENFORCEMENT_WARNING variable.

Bug: 73535841
Test: make w/ and wo/ flag.
Change-Id: I3cc720bf060e2bc789e10884ff888d527b91cb50
2018-02-21 18:10:59 +00:00
Tao Bao 4e636f0441 Merge "releasetools: Clean up test_sign_target_files_apks.py." am: 5ef78033d5
am: e1fee81bb5

Change-Id: I3c504df0a047b88725433c68079c18495d536afe
2018-02-21 02:29:12 +00:00
Tao Bao e1fee81bb5 Merge "releasetools: Clean up test_sign_target_files_apks.py."
am: 5ef78033d5

Change-Id: I70fff395a1923cc5566559662d3f9ee43adcea90
2018-02-21 02:21:07 +00:00
Tao Bao 5ef78033d5 Merge "releasetools: Clean up test_sign_target_files_apks.py." 2018-02-21 02:06:00 +00:00
Tao Bao 6f142ef096 Merge "releasetools: Add a testcase for common.ParseCertificate()." am: a0f55ee9eb
am: 9773a2f7b2

Change-Id: I3b00809f57c7f42f69fdbb44cdc5516e585ee987
2018-02-21 00:28:14 +00:00