am: 6e90dbf
* commit '6e90dbff6ceed17431f91545bbb9cf5fb34b56a4':
change order of windows downloads
Change-Id: I80cdc111a521381c87f7992186ce401ad65a431a
am: 6b2a986
* commit '6b2a98630bd6d14f46b1e04e0cad6de95393eb8e':
clarify what's in each windows package and rename the other packages to command line tools
Change-Id: I725ac866c2b5dfa4a5a3daceea4f12f53b8d42af
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
am: 190e610
* commit '190e610df3f15c00d46e8ee5bec661363334a86e':
new styles and tab-highlighting to support custom Android Studio site design
Change-Id: I020f54c66e38ab23d996c80562bd80376bbb751d
am: c607a4d
* commit 'c607a4d4d5f303d3ff139d752ccd69a7b2567aea':
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: Iac0edd81d0bcb710cf4c72d77ee457fbf06932b2
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
Now that mac compatibility has been fixed
BUG: 27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
am: 0d268be
* commit '0d268bea3c497ff727c79dd5cec16dad354c5b32':
increment version for fetched js and cs files to avoid proxy caching.
Change-Id: If23aa04da44de5e55cd8f1ba5250a3174c1a6ed5
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
am: 843649b
* commit '843649bab10d2e6b8c9791132de7b6217dabed59':
Migrating web search api to custom search api on templates-sdk
Change-Id: I7f85542e8fd0534ac492e848c7b3070dc056cb43
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
am: 38b0e22
* commit '38b0e22049346ad8955bdbb5b1927d1253dab273':
new search results layout. no more custom suggestions; just API matches and organic results.
Change-Id: I99278398150c173255c58c1be133766f1596e9f7
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]
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]
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
We no longer use emma with Jack. However, during the process of a
full build, we may run the emma task and overwrite the coverage file
generated by Jack with the one from emma because they use the same
filename.
This CL renames coverage files generated by emma so they no longer
break those created by Jack.
Keep coverage.em file name for host rules where Jack is not called.
Bug: 27822188
(cherry picked from commit 491c9ce48a
&& commit 8f0e52c3a6)
Change-Id: I26beee5a8d42a2ef1d476661e4b591fb09f1276f
Hardware-backed keystore attestation and version binding rely on
PLATFORM_SECURITY_PATCH having the format YYYY-MM-DD.
Bug: 22914603
Change-Id: If116e3ca5611920021b098d6b610ae609956aa5c
