Commit Graph

43497 Commits

Author SHA1 Message Date
Bo Hu c75bf85314 Merge "emulator: remove opengles property" am: c187fdf751 am: 438eebab81
am: 6dc9db6051

Change-Id: Ic3c9c3b70f20f88fa507411ae55f06040140aa35
2018-02-23 23:18:25 +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
TreeHugger Robot 717c3c1fff Merge "emulator: remove usb permission" 2018-02-23 22:06:53 +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
Przemyslaw Szczepaniak a5b2bad232 Merge "Remove org.apache.http.legacy from bootclasspath" 2018-02-23 14:05:59 +00:00
Bruno Martins f6ae536800 core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES
* These packages are already being explicitly added in
   core_minimal makefile.

Change-Id: Ib79f5575efc3903fe901727bb238e8e0946db768
2018-02-23 11:41:52 +00:00
bohu b4602eb446 emulator: remove usb permission
emulator does not  really support usb, remove it.

Change-Id: Iea31c9f57fe6635142fe4936a98a1be2f319fa65
2018-02-22 22:39:20 -08:00
Nan Zhang 08dc62dd09 Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8 am: 7edfe29e8f
am: b335c4a4f3

Change-Id: I9ebf18cf05571c4d5cf31c41fb5f60114a375480
2018-02-22 23:25:08 +00: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 cf9c445ef9 Merge "releasetools: Allow skipping postinstall hooks when generating A/B OTAs." am: 6c0ddf2480 am: ff1288821d
am: a5baf56e6c

Change-Id: I59bf83ba415351ba07488086d8b812453b0ae61b
2018-02-22 20:49:01 +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 567fa9012b Merge "releasetools: Check for duplicate entries in ReplaceCerts()." am: 8bfde7c5fb am: 7032691417
am: 894cba2954

Change-Id: Ic89d331846654d23768e90cb4abab1b91d744271
2018-02-22 18:05:39 +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
Przemyslaw Szczepaniak bd613de7ff Remove org.apache.http.legacy from bootclasspath
Another attempt, waiting for b/73762903 to be mitigated

Change-Id: I496b1297f5dfe0737828ab01fc1b628f64a57304
Test: build, flash and cts/tests/signature/runSignatureTests.sh, manual
Bug: 18027885
2018-02-22 16:38:49 +00:00
Przemyslaw Szczepaniak 99abb9f731 Merge "Revert "Remove org.apache.http.legacy from bootclasspath"" 2018-02-22 16:10:12 +00:00
Przemyslaw Szczepaniak 929db472be Revert "Remove org.apache.http.legacy from bootclasspath"
This reverts commit 58b793771c.

Reason for revert: b/73762903

Change-Id: I2faa22d47278d436baa6d7994f0bad879ac7265b
Exempt-From-Owner-Approval: Revert
2018-02-22 16:07:53 +00:00
Mathew Inwood d4ce430185 Merge "Include hiddenapi-whitelist.xml in the build." am: b3d619f22d am: cf68e9e8bd
am: 24b47e09ae  -s ours

Change-Id: I4013a75033952174b0ed1da0da340eb1dc452dfa
2018-02-22 15:57:26 +00:00
Tobias Thierer 7b179ae177 Clarify error message for bootclasspath whitelist.
Before this CL, the build could fail with error messages such as:

Error: out/target/common/obj/JAVA_LIBRARIES/core-oj_intermediates/classes.jar
contains class file jdk/internal/HotSpotIntrinsicCandidate.class, which is not
in the whitelist

This error message was only moderately helpful because it left a few
questions unanswered or misled ("Whitelist for what?", "Where does the
whitelist live?", "Is it a whitelist of class files or of packages?").

This CL clarifies that:
 - it's a whitelist of packages allowed on the bootclasspath,
 - where it lives (currently
   build/make/core/tasks/check_boot_jars/package_whitelist.txt)
which makes the error message more actionable.

Test: manually checked that the error message now looks okay.
Bug: 17434570

Change-Id: I2f52a5e2eb532bc4945bedf9811de5857f67a9a3
2018-02-22 14:42:28 +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 1b7700340c Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." am: 3c76d02668 am: ab8f5d74f2
am: 1f903cce0c

Change-Id: I6558665d9488b462fd00ad89a570817f0a03c23d
2018-02-22 12:03:30 +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
TreeHugger Robot 3d4d61d080 Merge "Remove org.apache.http.legacy from bootclasspath" 2018-02-22 04:34:34 +00:00
Nan Zhang 972bd248f9 Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd am: 90b8d087e6
am: 7e634580ba

Change-Id: I514525914843c2cad6591ed6f515aed3aecc286a
2018-02-22 02:36:22 +00: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 bccd0a571b Merge "Add property for generating dm files" am: 3d2b45ad55 am: d8cb5746be
am: a6355cbc9b

Change-Id: I5e99c7753a9c0831f8ee0b9223bc1a7b6b56540d
2018-02-22 01:50:08 +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