Commit Graph

28077 Commits

Author SHA1 Message Date
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
Michael Wright 22adbae358 DO NOT MERGE Remove inputflinger from the nyc build.
Change-Id: Iba52bcb3f7089984333b63eb43ea9d8ad4522e55
2016-04-12 09:26:02 -04: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
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 6edfbfabad Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev 2016-04-11 22:08:59 +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 e09b2c16e3 Merge "Add be and bs to l10n builds" into nyc-dev 2016-04-11 21:35:46 +00:00
Dan Willemsen 758f872836 Merge "Ensure prebuilt executables are executable" into nyc-dev 2016-04-11 19:59:10 +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 18da8dd97a Update code coverage filtering
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).

When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.

Bug: 28014424

(cherry picked from commit 74ec3f49d1)

Change-Id: Ie4253981c0e6a62422ab84dfd67ef5eebc0b0284
2016-04-11 16:43:12 +02:00
Ian Pedowitz 839ec10bbc PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3
Bug: 27150977
Change-Id: I8f13cec505a73678fb605ee3bce00519d16c2f7e
2016-04-08 14:05:00 -07:00
Mohamad Ayyash b354a61f3e Merge "Use fs_config files for mksquashfs" into nyc-dev 2016-04-08 17:39:06 +00:00
Mohamad Ayyash 8837882fb9 Use fs_config files for mksquashfs
BUG: 27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-07 22:10:51 -07:00
Igor Murashkin 1d4ad6a527 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
2016-04-07 16:55:08 -07:00
Svetoslav Ganov 048faf920c Merge "Add ext libs to AOSP - they are part of the system" into nyc-dev 2016-04-07 23:36:40 +00:00
Svetoslav Ganov 8ead371831 Add ext libs to AOSP - they are part of the system
bug:27698377

Change-Id: Ic426e08e450598c53e4dbf9c734d808b19fae705
2016-04-07 15:29:58 -07:00
Joe Onorato 4b60ee5b7b Merge changes I8f95f3f8,Ic2e384ad into nyc-dev
* changes:
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.
2016-04-07 18:34:43 +00:00
Joe Onorato 48bd6f53f4 Add generation of a module-info.json file
This outputs all of the modules that the build system knows about
for this invocation.

Change-Id: I8f95f3f8443c18f7898ce90e287432cbd2b6db6d
2016-04-06 19:11:51 -07:00
Joe Onorato 969b6f8ada Remove unused module-info.txt generation.
Change-Id: Ic2e384ad3e2bae8e76a98818c18a99bf5d427b0e
2016-04-06 14:49:55 -07:00
Trevor Johns a5f006873c Merge branch 'goog/mnc-mr-docs' into mnc-ub-dev
Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
	tools/droiddoc/templates-sdk/assets/css/default.css
	tools/droiddoc/templates-sdk/sdkpage.cs

Issue: 28000173
Change-Id: If04c741090d99d384981b8b3554edc58eb82dd0e
2016-04-05 20:32:32 -07:00
Amanda Kassay ebcf3977a2 Tabs js error fix, DevSite css issues fix, Search filtering
Staged: http://akassay.nyc.corp.google.com:8080/index.html#q=Activity
Change-Id: Id25525a8d8c927ea67cd13b43652d75ce53733cf
2016-04-05 20:46:13 +00:00
smain@google.com 190e610df3 new styles and tab-highlighting to support custom Android Studio site design
Change-Id: I27d11f4526ba79bce8deb5102cc2afbe34a0e116
2016-04-05 11:13:12 -07:00
Sebastien Hertz e771251424 Merge "Fix code coverage for apps" into nyc-dev 2016-04-05 07:11:48 +00:00
smain@google.com 7281802438 tweak the NDK download analytics event tag
Change-Id: I822d744f7f370330a26f0ff612de357dbe1005fe
2016-04-04 16:17:01 -07:00
Mohamad Ayyash 21e6bf3b38 Merge "Always build squashfs host tools" into nyc-dev 2016-04-04 19:46:48 +00:00
Dirk Dougherty c607a4d4d5 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.

Change-Id: Ibc4ddb4a6130ab8bd8d6044472022465829f2000
2016-04-04 12:45:04 -07:00
Mohamad Ayyash 5d65020e44 Always build squashfs host tools
Now that mac compatibility has been fixed

BUG: 27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-04 12:31:41 -07:00
Maurice Lam cc06c5998a Add be and bs to l10n builds
Bug: 27409618
Change-Id: I244796a12d756521f8191abcacf1f15134079783
2016-04-01 12:08:05 -07:00
Julien Desprez 1287843ab7 Add vts to build in ninja
Bug: 27687012
Change-Id: Icb94e3eee71a8f54f13f868fa2461b2063e7ca6d
2016-04-01 15:39:48 +01:00
Dirk Dougherty 0d268bea3c increment version for fetched js and cs files to avoid proxy caching.
Change-Id: I427151284bf6777adb04e85b07b9b70355f8f7a2
2016-03-31 15:59:09 -07:00
Miao Wang a529cebde8 Merge "[RenderScript] Update the build rules for x86_64 support lib." into nyc-dev 2016-03-31 22:25:10 +00:00
Johan Redestig 8d3311f50d DO NOT MERGE ANYWHERE - Add libbase to otatools
build_verity_tree uses libbase since b104044.

Change-Id: I6d3406a107ceb6cd58d1a51aa79935209d4c435f
2016-03-31 14:20:38 -07:00
Miao Wang 57ef7ea490 [RenderScript] Update the build rules for x86_64 support lib.
Bug: 19735423

  - Unlike other archs, x86_64 has both usr/lib and usr/lib64. we need
    to search for libm.so and libc.so in lib64/. Otherwise the linker
    will report error.

Change-Id: I2859bee066a9eb100828d90da8adf0f9817d77e6
2016-03-31 14:05:33 -07:00
Ying Wang 9109282846 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" into nyc-dev 2016-03-31 18:06:27 +00:00
Amanda Kassay 843649bab1 Migrating web search api to custom search api on templates-sdk
akassay.nyc.corp.google.com:9000/#q=mobile
Change-Id: I71bdc7dbfede7bff0361ce00abef8081b852dd36
2016-03-31 16:40:35 +00:00
Sebastien Hertz d9641e01f3 Fix code coverage for apps
When building apps with EMMA_INSTRUMENT=true, we must ensure that
jacoco is at least on the classpath (or even embedded for unbundled
branches) and that proguard will ignore jacoco classes. Otherwise
the Jack compilation would fail.

For unbundled build, we include the proguard configuration file
build/core/proguard.jacoco.flags to ignore jacoco classes.

For full build, we ensure jacoco is on the classpath during the
jack compilation.

Bug: 27607712
Change-Id: I0ad37d74e63028a8144a125f052dc1c5fa10fc66
2016-03-31 18:33:57 +02:00
Sebastien Hertz 301d5955da Merge "Rename emma coverage files" into nyc-dev 2016-03-31 06:58:30 +00:00
Philip P. Moltmann 8690de4302 Merge "Add PrintServiceRecommendationService to the default distro" into nyc-dev 2016-03-31 01:33:17 +00:00
Andreas Gampe be97a41571 Merge "Build: Switch eng build boot dexopt to verify-at-runtime" into nyc-dev 2016-03-30 23:05:59 +00:00
Colin Cross bbb7b1b620 Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev
* changes:
  Handle symlinked OUT_DIRs (again)
  Handle out being a symlink
2016-03-30 22:18:34 +00:00
smain@google.com b7595b8256 remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages
am: 1c8d4a4

* commit '1c8d4a49e9c51ba1addfca8c86a535a0267ceba3':
  remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages

Change-Id: I180df937382f6e9df50750e507ef0497b254a2e5
2016-03-30 21:34:48 +00:00
smain@google.com 38b0e22049 new search results layout.
no more custom suggestions; just API matches and organic results.

Change-Id: I6324aa6fb289f5d93aa701aecbd7fad64711d35f
2016-03-30 14:27:29 -07:00
smain@google.com 1c8d4a49e9 remove dev guide search suggestions, move organic search results up.
tweak the search suggest for reference pages

Change-Id: I14e48fdac3f103dd998591886b91e5f6040b0f7a
2016-03-30 14:27:12 -07:00
Andreas Gampe 8e121663e6 Build: Switch eng build boot dexopt to verify-at-runtime
To have faster turnaround.

Bug: 26794212
Change-Id: I1d7877ec8c9cfff62bf14cbd23a790ee7a0b2734
2016-03-30 12:55:53 -07:00
Dan Willemsen ae18638b04 Handle symlinked OUT_DIRs (again)
My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.

This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.

Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:

 1) Soong generates out.angler/soong/Android.mk
 2) Kati's find generator produces in-memory tree of the filesystem
 3) $(shell ) creates out.angler/Android.mk
 4) The emulated findleaves Android.mk search finds
    out.angler/soong/Android.mk since the in-memory tree is never updated.

This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.

Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
(cherry picked from commit cc60f01357)
[ccross: resolved conflicts in nyc-dev]
2016-03-30 12:24:57 -07:00
Dan Willemsen 4e2677eaf1 Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.

Bug: 27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
(cherry picked from commit d53c0c7b45)
[ccross: resolved conflicts in nyc-dev]
2016-03-30 12:24:44 -07:00
Neil Fuller b08544ed7d Add core-lambda-stubs to default classpath for target libs compiling using javac
In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.

Bug: 27475234
Bug: 26753820
Bug: 26604040
Change-Id: Ifc79eebabfc6b64c0daf6b9ca236d1967a45a735
2016-03-30 11:01:33 -07:00