Commit Graph

29003 Commits

Author SHA1 Message Date
Ying Wang b795dfe23a Include classes.jar with class files in aar. am: 8419b7f
am: edb0724

* commit 'edb07245a6a68f98d2078f18c33bb8682e8adf0e':
  Include classes.jar with class files in aar.

Change-Id: Ice54b6a68225342c7ff02814ccf55eb2b56d86bc
2016-04-12 23:03:47 +00:00
Ying Wang edb07245a6 Include classes.jar with class files in aar.
am: 8419b7f

* commit '8419b7f35e2609d98a9da38e56e1839e21d4a298':
  Include classes.jar with class files in aar.

Change-Id: I30c12caf4a364d9586fd60bebeac929145ef6be3
2016-04-12 22:49:48 +00:00
Christopher Wiley 6a1dab8817 Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS" am: 5f3b368 am: 02b786c
am: 008b9c5

* commit '008b9c5624ad1c2def11789b4b062eaace5dd97b':
  Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS

Change-Id: If26598745a73df6d0b9802aa6ac472d637e89ddd
2016-04-12 22:21:33 +00:00
Treehugger Robot 008b9c5624 Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS" am: 5f3b368
am: 02b786c

* commit '02b786ce2d370cb5d3a33de9b61a9255114f978d':
  Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS

Change-Id: I978f51fe6561f60e8f054b4314d77fcc6136bcb5
2016-04-12 22:14:48 +00:00
Christopher Wiley 02b786ce2d Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
am: 5f3b368

* commit '5f3b3689af234bf5b16671cc01ae4d14956fac0a':
  Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS

Change-Id: I38db1f575907c48355d8e88e52d273bedc3b139a
2016-04-12 22:12:07 +00:00
TreeHugger Robot 07f1238bf5 resolve merge conflicts of bc3720c to nyc-dev-plus-aosp
am: 97069b0

* commit '97069b07c39e29c2a784c5636730bd3681847b07':
  Benchmark have their own folder

Change-Id: I843c16029a4e0d13b6dd309a8c72516e83e4ae86
2016-04-12 22:11:49 +00:00
Treehugger Robot 5f3b3689af Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS" 2016-04-12 21:24:51 +00:00
Guang Zhu 97069b07c3 resolve merge conflicts of bc3720c to nyc-dev-plus-aosp
Change-Id: I2372a61a39131ede33cda95afc3c3ddd19e542f0
2016-04-12 13:06:20 -07:00
Ying Wang 8419b7f35e Include classes.jar with class files in aar.
As we switched to Jack the LOCAL_BUILT_MODULE (javalib.jar) now
include .jayce files.

Change-Id: If802e02bb20a9e105ca9563e6fe483f7acce00e6
2016-04-12 12:57:36 -07:00
TreeHugger Robot bc3720c695 Merge "Benchmark have their own folder" into nyc-dev 2016-04-12 19:16:52 +00:00
Trevor Johns 72acac6276 Merge "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev am: 18c202a
am: 748ea8a

* commit '748ea8acb07d727c18002058b8a07cf2f5861631':
  Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"

Change-Id: I1af81f8676e49dc560bb5accc35aa5bcdfe5eaac
2016-04-12 18:53:56 +00:00
Trevor Johns c0e26de6ea Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
am: 1348277

* commit '1348277a292d976dbcfa2f4ea322fb93ac1a67e2':
  Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"

Change-Id: I0ccd6993accfbb442ba8298b8d73db7c39b938a6
2016-04-12 18:53:55 +00:00
Trevor Johns 748ea8acb0 Merge "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev
am: 18c202a

* commit '18c202a7d30591ba3b06f40231644fc86ae1ddc3':
  Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"

Change-Id: I4c8a10fa7d5093f5a0d3e23a185bc4209925146a
2016-04-12 18:48:07 +00:00
Trevor Johns 1348277a29 Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad, reversing
changes made to e09b2c16e3.
(cherry picked from commit bf234fdfba)

Change-Id: Id57aecad79fb601488799ed99437118d1a9faf7c
2016-04-12 18:45:12 +00:00
Trevor Johns 18c202a7d3 Merge "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev 2016-04-12 17:59:02 +00:00
Julien Desprez 188a1dd18f Benchmark have their own folder
Benchmark tests use a separate folder from native tests.

Bug: 27465556
Change-Id: Ife0f43062e36ffc856f41683ddc4d91a7787333e
2016-04-12 18:57:36 +01:00
Trevor Johns bf234fdfba Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad, reversing
changes made to e09b2c16e3.
2016-04-12 10:35:42 -07:00
Tao Bao 9b23e4687a Merge "releasetools: Use fixed timestamp in otacerts.zip." am: 7b049f7 am: 480449d
am: 73b8fa1

* commit '73b8fa1cdfa9f32807016e84bb849efa1590e71a':
  releasetools: Use fixed timestamp in otacerts.zip.

Change-Id: I1aa43063a7c1f35f4c56f8a0937a1914ea2c6aeb
2016-04-12 16:55:53 +00:00
Tao Bao 73b8fa1cdf Merge "releasetools: Use fixed timestamp in otacerts.zip." am: 7b049f7
am: 480449d

* commit '480449dfc60bcaac4596c2d76daaa3ee374ee222':
  releasetools: Use fixed timestamp in otacerts.zip.

Change-Id: I7c73f9c95c2e4da61abfceef99013fccc25204c9
2016-04-12 16:50:14 +00:00
Tao Bao 480449dfc6 Merge "releasetools: Use fixed timestamp in otacerts.zip."
am: 7b049f7

* commit '7b049f715c4dc241ffb23ddee8374742246936de':
  releasetools: Use fixed timestamp in otacerts.zip.

Change-Id: I3708511770fb022618592753d9de6ddc0c4df23b
2016-04-12 16:44:34 +00:00
Tao Bao 7b049f715c Merge "releasetools: Use fixed timestamp in otacerts.zip." 2016-04-12 16:32:32 +00:00
Christopher Wiley ff1c3f2b05 Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS
Listing a library in any of:

  LOCAL_EXPORT_SHARED_LIBRARY_HEADERS
  LOCAL_EXPORT_STATIC_LIBRARY_HEADERS

will cause the headers exported by that library to be exported from
the current library target as well.

This means that when library A's public headers include headers from
library B, library C which consumes A no longer has to explicitly list
A and B in its LOCAL_SHARED_LIBRARIES for the purpose of picking up B's
headers.

Bug: 27804373
Test: Introduced dependency on libbase to libbinder at the header level.
      Libraries that consume libbinder do not need to explicitly depend
      on libbase.

Change-Id: If69079f058a4a182c5ef5a3c5ba15035570da22d
2016-04-12 09:27:29 -07:00
Tao Bao 35a785eef4 releasetools: Use fixed timestamp in otacerts.zip. am: 7ee3a96
am: 41e5c4e

* commit '41e5c4e0659f23c978e9b47d6b4d1564b076ff8b':
  releasetools: Use fixed timestamp in otacerts.zip.

Change-Id: I881de4ebee7ffae32b008144c4e0a61a0e3802b7
2016-04-12 15:49:49 +00:00
Tao Bao 41e5c4e065 releasetools: Use fixed timestamp in otacerts.zip.
am: 7ee3a96

* commit '7ee3a9678e7191c48f0ba4e04792fe97925c1aa1':
  releasetools: Use fixed timestamp in otacerts.zip.

Change-Id: I9e8260491819e00eea6f4eb55b1722ae1670ae85
2016-04-12 15:44:31 +00:00
Tao Bao 83cd79d340 releasetools: Use fixed timestamp in otacerts.zip.
We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.

Replace with common.ZipWrite() to always use a fixed timestamp.

Bug: 28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
(cherry picked from commit 7ee3a9678e)
2016-04-12 08:34:43 -07:00
Tao Bao 7ee3a9678e releasetools: Use fixed timestamp in otacerts.zip.
We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.

Replace with common.ZipWrite() to always use a fixed timestamp.

Bug: 28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
2016-04-11 23:10:00 -07:00
Andreas Gampe 40e0890070 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" am: 8a547f1 am: c0f254a
am: 0a0fd08

* commit '0a0fd088c1b59ee63a255fa0e0a16ea4f547b9cb':
  Build: Add ART_BOOT_IMAGE_EXTRA_ARGS

Change-Id: I9655cc8b11587146447cdd225ed14135f62bac1c
2016-04-12 03:12:09 +00:00
Andreas Gampe 0a0fd088c1 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" am: 8a547f1
am: c0f254a

* commit 'c0f254a5b9710f459fba044530bace0c4bb107e1':
  Build: Add ART_BOOT_IMAGE_EXTRA_ARGS

Change-Id: I98d2311fd4789ea9e31f753b5a2ea09ac605ce00
2016-04-12 03:06:52 +00:00
Andreas Gampe c0f254a5b9 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"
am: 8a547f1

* commit '8a547f19b859e06baaf3c9495f3a2fc0eaa5905d':
  Build: Add ART_BOOT_IMAGE_EXTRA_ARGS

Change-Id: If44d2747e10e2b549e83c96f1916ca05b9af9d04
2016-04-12 03:01:39 +00:00
Andreas Gampe 8a547f19b8 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" 2016-04-12 02:46:58 +00:00
Tom Cherry 6c34407808 Merge "Add ext libs to core_tiny, they\'re needed for wear PDK" into nyc-dev am: ca0df0c
am: 6f808b2

* commit '6f808b261fa54b18c978685c2785074ec7ff853d':
  Add ext libs to core_tiny, they're needed for wear PDK

Change-Id: Ic035fd306322b0bc9e52828e5b6df5b6077e6d11
2016-04-12 01:54:33 +00:00
Tom Cherry 6f808b261f Merge "Add ext libs to core_tiny, they\'re needed for wear PDK" into nyc-dev
am: ca0df0c

* commit 'ca0df0c249593148f4bc036cac2662b3066b7fb5':
  Add ext libs to core_tiny, they're needed for wear PDK

Change-Id: I79bd83f3a886e03e764db1c75e5cf4d2d1aa2627
2016-04-12 01:49:27 +00:00
Tom Cherry ca0df0c249 Merge "Add ext libs to core_tiny, they're needed for wear PDK" into nyc-dev 2016-04-12 01:31:47 +00:00
Tom Cherry 1d242f18a6 Add ext libs to core_tiny, they're needed for wear PDK
Bug: 27698377
Bug: 28117608
Change-Id: I12b93fe241d8d71d61d1cdb28d95e6c824e2420d
2016-04-11 17:06:59 -07:00
Trevor Johns 8215484381 Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev am: 6edfbfa
am: 3514250

* commit '35142509fb58a0bf6c2ff29296c525721f1855d0': (44 commits)
  Tabs js error fix, DevSite css issues fix, Search filtering
  new styles and tab-highlighting to support custom Android Studio site design
  tweak the NDK download analytics event tag
  Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page.
  increment version for fetched js and cs files to avoid proxy caching.
  Migrating web search api to custom search api on templates-sdk
  new search results layout. no more custom suggestions; just API matches and organic results.
  remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages
  Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer.
  increment docs.js version to force browser refresh. needed to load recent fixes to the zippies.
  update zippy icons to use material arrow (up/down instead of right/down). fixes bug 27695580, which was caused because I previously submitted an update to the code doclava templates to do this but did not update the current site templates in kind.
  Docs: Change MD5 to SHA1 in NDK download table column heading
  change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
  Fix broken suggestions for preview.
  Revert "Search for suggestion matches across PREVIEW_RESOURCES."
  Docs: Updates NDK download table for NDKr11
  make image resource URLs relative so they work in offline docs
  docs: Update DAC template to force refresh of resources
  Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header.
  Add styles to compress the summary table presentation.
  ...

Change-Id: I56312f1383bb7585d28ccb43db709df8d5c0976e
2016-04-11 22:21:34 +00:00
Trevor Johns 35142509fb Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev
am: 6edfbfa

* commit '6edfbfabad1ddbda00e0fcc713672f6e63acdf44': (44 commits)
  Tabs js error fix, DevSite css issues fix, Search filtering
  new styles and tab-highlighting to support custom Android Studio site design
  tweak the NDK download analytics event tag
  Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page.
  increment version for fetched js and cs files to avoid proxy caching.
  Migrating web search api to custom search api on templates-sdk
  new search results layout. no more custom suggestions; just API matches and organic results.
  remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages
  Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer.
  increment docs.js version to force browser refresh. needed to load recent fixes to the zippies.
  update zippy icons to use material arrow (up/down instead of right/down). fixes bug 27695580, which was caused because I previously submitted an update to the code doclava templates to do this but did not update the current site templates in kind.
  Docs: Change MD5 to SHA1 in NDK download table column heading
  change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
  Fix broken suggestions for preview.
  Revert "Search for suggestion matches across PREVIEW_RESOURCES."
  Docs: Updates NDK download table for NDKr11
  make image resource URLs relative so they work in offline docs
  docs: Update DAC template to force refresh of resources
  Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header.
  Add styles to compress the summary table presentation.
  ...

Change-Id: I47a5c85da5c4f8edffa9ca3e6ba4bb573cc2666c
2016-04-11 22:16:20 +00:00
Andreas Gampe 907fb03273 Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.

Bug: 27265238
Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
2016-04-11 15:10:09 -07:00
Trevor Johns 6edfbfabad Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev 2016-04-11 22:08:59 +00:00
Maurice Lam 2dc22209c7 Merge "Add be and bs to l10n builds" into nyc-dev am: e09b2c1
am: 285ea21

* commit '285ea2188d8764333054292ed072608bd99ef7b8':
  Add be and bs to l10n builds

Change-Id: I7ae71007d9c8e9119762ca4ab8a4dc6dfa59bc24
2016-04-11 21:59:44 +00:00
Trevor Johns f719c29ea9 Resolve merge conflicts of a5f0068 to nyc-dev
Change-Id: Id0d573566abb989a173349ffaf01390cebd51607
2016-04-11 14:55:35 -07:00
Maurice Lam 285ea2188d Merge "Add be and bs to l10n builds" into nyc-dev
am: e09b2c1

* commit 'e09b2c16e32cee89d6b5ac29fe5a905b76872179':
  Add be and bs to l10n builds

Change-Id: I4dc1d353dd5a3d0ed3f4c0f9dc2192421946d87a
2016-04-11 21:54:51 +00:00
Maurice Lam e09b2c16e3 Merge "Add be and bs to l10n builds" into nyc-dev 2016-04-11 21:35:46 +00:00
Dan Willemsen e53d05a628 Merge "Ensure prebuilt executables are executable" into nyc-dev am: 758f872 -s ours
am: dd03962

* commit 'dd039629f54d9104ad153468d29d3118985b2b83':
  Ensure prebuilt executables are executable

Change-Id: Ie29d357ea086023c1213372205642ef12ceb4746
2016-04-11 20:13:42 +00:00
Dan Willemsen dd039629f5 Merge "Ensure prebuilt executables are executable" into nyc-dev
am: 758f872  -s ours

* commit '758f8728365358e41380c64806fb9cb0f026b980':
  Ensure prebuilt executables are executable

Change-Id: I448d55c5ee8be4d4c01ef218c358a288ba5609cf
2016-04-11 20:08:50 +00:00
Dan Willemsen 758f872836 Merge "Ensure prebuilt executables are executable" into nyc-dev 2016-04-11 19:59:10 +00:00
Sebastien Hertz b419f37679 Update code coverage filtering am: 18da8dd -s ours
am: 38cf9fa

* commit '38cf9faef85938a54c3af9c35d60ae4c97342ddd':
  Update code coverage filtering

Change-Id: I20fc9c789a03dee4ea85d5511bdf6d35e0a617b8
2016-04-11 19:58:32 +00:00
Sebastien Hertz 38cf9faef8 Update code coverage filtering
am: 18da8dd  -s ours

* commit '18da8dd97a39b562fbf021b8058c39904c74d418':
  Update code coverage filtering

Change-Id: I1cc46d30f1ed3dbad782e9e7beb30b2a440cf484
2016-04-11 19:53:37 +00:00
Dan Willemsen 23f326a67d Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.

Bug: 28097475
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
(cherry picked from commit 08420cbc8a)
2016-04-11 11:21:47 -07:00
Sebastien Hertz 0535454589 Merge "Update code coverage filtering" am: cb49804 am: e0f8435
am: e90a711

* commit 'e90a7110149d4d7ad6ba81e0bedf90eb4f5b5a12':
  Update code coverage filtering

Change-Id: Ifbf474c4c6f3357908e4e0939169c214cbbecd44
2016-04-11 14:50:56 +00:00
Sebastien Hertz e90a711014 Merge "Update code coverage filtering" am: cb49804
am: e0f8435

* commit 'e0f84353065a1d35c349e9e2939b3862a3aef7bd':
  Update code coverage filtering

Change-Id: I4787c538e3a47c792e68d639ae5d3fbfcd95f494
2016-04-11 14:46:20 +00:00