093283a070
am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit '820e226d5dc63589dec0263d3639526addb5dbaa':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 19:17:43 +00:00
820e226d5d
am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit 'd1ab4cb3b4ca8de66a873abb072bd73556926d4d':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 19:11:38 +00:00
d1ab4cb3b4
am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit '05e55e9009435072ac25d2ce487d47b6c4f8a60b':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 02:15:31 +00:00
05e55e9009
Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
2014-10-15 02:08:51 +00:00
ee5b3b10de
add butterbar for L announcement.
...
make the butterbar an encapsulated method for inclusion multiple places.
Change-Id: I7716bd293372dcf88cd0bd57fb399d01bfa897a0
2014-10-14 18:47:36 -07:00
b0d324aadd
Merge "resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
2014-10-15 00:19:06 +00:00
3e65583ef7
am f06c6eff: Add abi to generated XML
...
* commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
Add abi to generated XML
2014-10-15 00:18:37 +00:00
ae66eba6f3
resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp
...
Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f
2014-10-14 17:15:17 -07:00
f06c6eff65
Add abi to generated XML
...
bug:17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
2014-10-15 00:10:08 +00:00
852fc3e69c
am c131ec09: Merge "Link compiler-rt in the correct order."
...
* commit 'c131ec09d9ffb92473c4162c92c0646d6e731b0c':
Link compiler-rt in the correct order.
2014-10-15 00:05:35 +00:00
c131ec09d9
Merge "Link compiler-rt in the correct order."
2014-10-14 23:59:27 +00:00
e1b17e7ef5
Link compiler-rt in the correct order.
...
The compiler run-time library should always be the _last_ thing linked
when building static executables. This was being done correctly for
libgcc, but not when using compiler-rt.
Change-Id: I0689dc35f55caad2fe74c0cbb4cbe3008ded349a
2014-10-14 10:45:33 -07:00
337dd2e637
am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:45:42 +00:00
33f33371cd
am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '165fdf42042d7c13d9f7866b3a3eff841e08dad2':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:41:47 +00:00
165fdf4204
Merge "Remove "-mstackrealign" option from all x86 builds."
2014-10-13 22:35:59 +00:00
ae2d47a47f
Remove "-mstackrealign" option from all x86 builds.
...
For ndk docs change, please refer to:
https://android-review.googlesource.com/#/c/110100/
Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2014-10-13 19:08:01 +04:00
1dc5b58689
am 4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev
...
* commit '4543ae819da023b8d51f36497c6e5445a51b70ba':
Add Cutive Mono to makefiles
2014-10-10 23:46:06 +00:00
4543ae819d
Merge "Add Cutive Mono to makefiles" into lmp-dev
2014-10-10 23:41:20 +00:00
6444212890
Add Cutive Mono to makefiles
...
BUG: 17666124
Change-Id: I73aee6b7a211bfbd0bdba9c6c630c4c5dea905c7
2014-10-10 19:53:44 +00:00
150a572351
am f0daf562: Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there\'s no searchbar on the page" into lmp-dev
...
* commit 'f0daf562f766d1cf15583e171b94107c193e5db4':
fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page
2014-10-10 14:35:10 +00:00
6cd8239682
am 17e2c06e: make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
...
* commit '17e2c06e8aa92b9d99e8e3a8e6f44a630e9529ad':
make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
2014-10-10 14:35:09 +00:00
8d28a2c044
am a4d1f6a7: SDK Addon multi-sys-img support.
...
* commit 'a4d1f6a7f0399b5e5e38b7c6f274f5fb11be48b9':
SDK Addon multi-sys-img support.
2014-10-10 14:34:31 +00:00
8755756f26
resolved conflicts for merge of 3907c03e to lmp-dev-plus-aosp
...
Change-Id: I580ab0693609ff506da7346548a45322000114d1
2014-10-09 19:29:53 -07:00
3907c03e24
am f1794738: Merge "Introduce per-product per-module dex-preopt config"
...
* commit 'f1794738b178c22bd7f05348f2a393cdec23ade4':
Introduce per-product per-module dex-preopt config
2014-10-10 02:19:10 +00:00
f1794738b1
Merge "Introduce per-product per-module dex-preopt config"
2014-10-10 02:13:10 +00:00
f0daf562f7
Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page" into lmp-dev
2014-10-10 02:12:24 +00:00
17e2c06e8a
make the <a> tag offset effective for the whole site,
...
not just reference, because turns out these are also used in the manifest docs,
so what the heck.
Change-Id: I33d3cf842377511d0733983deffa03639eb0bdbf
2014-10-09 19:10:32 -07:00
2f077190ab
fix bug causing anchors to fail on preview landing page;
...
exit the onhashchange listener if there's no searchbar on the page
Change-Id: I7bdd31d0ea997e408b997856450822d1bc56af92
2014-10-09 18:04:10 -07:00
a4d1f6a7f0
SDK Addon multi-sys-img support.
...
Fix an issue where the add-on system images have 2 extra
inner folders. The sole root folder in the zip file should
be the ABI one.
Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f
2014-10-10 00:50:39 +00:00
37df3be46d
am 96a81b18: am fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"
...
* commit '96a81b18ac1f01760a3ef573289cefdfbc810cb7':
Docs: Making source.android.com headers match those of developer.android.com
2014-10-09 17:42:47 +00:00
96a81b18ac
am fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"
...
* commit 'fb68db08000e2d22461edbfa663e298c672476c0':
Docs: Making source.android.com headers match those of developer.android.com
2014-10-09 17:38:40 +00:00
fb68db0800
Merge "Docs: Making source.android.com headers match those of developer.android.com"
2014-10-09 17:33:27 +00:00
25756c1422
am 8913e282: am 29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
...
* commit '8913e28295a9f93121fa60f74a6ff39eadd2e86d':
Add -fPIC as default Clang mips ASFLAGS.
2014-10-09 17:24:37 +00:00
8913e28295
am 29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
...
* commit '29373be81de4d6e8817434b146c395b2a28e4628':
Add -fPIC as default Clang mips ASFLAGS.
2014-10-09 17:20:01 +00:00
29373be81d
Merge "Add -fPIC as default Clang mips ASFLAGS."
2014-10-09 17:17:08 +00:00
c206b0671f
am edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev
...
* commit 'edb9df24d00091a5206ba36d7f32ed75d6c462b9':
Check $(built_dex) to determine if we can run dex-preopt.
2014-10-09 12:34:03 +00:00
6adf02580b
am 24c1d149: am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
...
* commit '24c1d149678dcd03f679bfa0fc29386cee779935':
LOCAL_NATIVE_COVERAGE should imply -O0.
2014-10-09 01:14:58 +00:00
24c1d14967
am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
...
* commit 'a01fa4f8a369580a888317d0ea7f3507f4dcc828':
LOCAL_NATIVE_COVERAGE should imply -O0.
2014-10-09 01:01:39 +00:00
a01fa4f8a3
Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
2014-10-09 00:56:23 +00:00
4c12c0303c
LOCAL_NATIVE_COVERAGE should imply -O0.
...
Optimization can lead to incorrect coverage results.
Change-Id: I8ade9ab246e292d26ac18821baf9970e29dc1a1f
2014-10-08 17:05:19 -07:00
dcfaac5f8e
am 811e650b: Merge "Add appops command to devices" into lmp-dev
...
* commit '811e650b820ffa4f291d18d6f49673314848c810':
Add appops command to devices
2014-10-08 22:48:46 +00:00
ce6300a5db
Add -fPIC as default Clang mips ASFLAGS.
...
For mips target, gcc passes -KPIC to assembler by default,
but clang passes -KPIC only if -fPIC or -fpic is given.
BUG: 17895505
Change-Id: I7803adaf8ad7b40c6473872b67f4e0b4c502b38a
2014-10-08 15:41:29 -07:00
edb9df24d0
Merge "Check $(built_dex) to determine if we can run dex-preopt." into lmp-dev
2014-10-08 22:25:17 +00:00
62fb8a1f55
Check $(built_dex) to determine if we can run dex-preopt.
...
Change-Id: Icfed37f50671ec041f2cfdcec9175cb094b572fc
2014-10-08 15:23:24 -07:00
811e650b82
Merge "Add appops command to devices" into lmp-dev
2014-10-08 18:03:15 +00:00
02bbd640e7
Add appops command to devices
...
This is used to set appops permissions from the command line
or from CTS tests via the shell.
Change-Id: I8a71d1398e2071aecfd22be7b6530f186f40c2c0
2014-10-08 10:53:59 -07:00
20ebd2ef08
Introduce per-product per-module dex-preopt config
...
- Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat.
- Added macro add-product-dex-preopt-module-config to specify almost
arbitrary dex-preopt config/flags to modules in product
configuration:
$(call \
add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>)
How <config_or_flags> is interpreted is decided by
dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we
disable dexpreopt for the given modules; otherwise pass it to dex2oat as
command line flags.
- If there are multiple configs for the same module in the product
inheritance, the first takes precedence.
- Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default
dex2oat flags in product configuration.
- Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat.
Bug: 17791867
Change-Id: I1b2955e8e51039e94d1ff43a3265a8d03598632c
2014-10-08 10:11:17 -07:00
cc9e30ef35
am 1a856098: Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev
...
* commit '1a856098ea819a75ad904ff6d6dcfac9545a02a6':
Export build thumbprint only if the product has specified at least one oem fingerprint property
2014-10-08 16:38:40 +00:00
1a856098ea
Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev
2014-10-08 16:33:16 +00:00
e24e17a976
Export build thumbprint only if the product has specified at least one oem fingerprint property
...
Bug: 17888863
Change-Id: I4d12bc977dcb5e8e1858efb2a395466d8779de34
2014-10-07 18:59:47 -07:00
smain@google.com