OSDN Git Service
Ying Wang [Thu, 9 Jan 2014 18:57:03 +0000 (10:57 -0800)]
am
aed49987: Merge "Allow clang to build host binaries."
* commit '
aed499879210c7432c1c5b3869f383b27b17dafc':
Allow clang to build host binaries.
Ying Wang [Thu, 9 Jan 2014 18:52:06 +0000 (18:52 +0000)]
Merge "Allow clang to build host binaries."
Narayan Kamath [Wed, 8 Jan 2014 10:05:12 +0000 (02:05 -0800)]
am
8530e25f: Merge "Remove libSR_AudioIn from base.mk"
* commit '
8530e25ff666987c7c968c2a323a8b1e7867bcca':
Remove libSR_AudioIn from base.mk
Narayan Kamath [Wed, 8 Jan 2014 09:59:55 +0000 (09:59 +0000)]
Merge "Remove libSR_AudioIn from base.mk"
Ying Wang [Wed, 8 Jan 2014 00:50:49 +0000 (16:50 -0800)]
am
f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit '
f12d48104ba782d877afc31a081748fdc881f2b6':
PRODUCT_BOOT_JARS as a list of jar names separated by space
Ying Wang [Wed, 8 Jan 2014 00:45:15 +0000 (00:45 +0000)]
Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
Ying Wang [Tue, 7 Jan 2014 22:31:49 +0000 (14:31 -0800)]
PRODUCT_BOOT_JARS as a list of jar names separated by space
This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their
product configuration files.
Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
Narayan Kamath [Tue, 7 Jan 2014 10:06:13 +0000 (10:06 +0000)]
Remove libSR_AudioIn from base.mk
This is an obsolete rule that was grandfathered in because
it was a USER module at some point. It's no longer
required, even by builds that use packages/app/VoiceDialer.
Change-Id: Ife9e89bd1b03c0364e27650863a83bad945b8089
Logan Chien [Tue, 10 Dec 2013 11:07:41 +0000 (19:07 +0800)]
Allow clang to build host binaries.
Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7
Ying Wang [Sat, 4 Jan 2014 01:59:59 +0000 (17:59 -0800)]
am
a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
* commit '
a47d12e38ae38a6fdceb54172490c94408efa0de':
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
Ying Wang [Sat, 4 Jan 2014 01:54:02 +0000 (01:54 +0000)]
Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
Ying Wang [Sat, 4 Jan 2014 00:24:56 +0000 (16:24 -0800)]
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug
12382916.
Bug:
12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
Nick Kralevich [Thu, 2 Jan 2014 19:54:59 +0000 (11:54 -0800)]
am
6e8ffe3f: Merge "Allow execmem and ashmem_device execute as required."
* commit '
6e8ffe3f1e328ee71354b539e63b34b2342160a8':
Allow execmem and ashmem_device execute as required.
Nick Kralevich [Thu, 2 Jan 2014 19:50:09 +0000 (19:50 +0000)]
Merge "Allow execmem and ashmem_device execute as required."
Ying Wang [Fri, 27 Dec 2013 20:46:31 +0000 (12:46 -0800)]
am
d23bd8f5: Merge "e2fsck missing from emulator"
* commit '
d23bd8f59f396ecd23a54d4e9b798bc872a2e505':
e2fsck missing from emulator
Ying Wang [Fri, 27 Dec 2013 20:41:02 +0000 (20:41 +0000)]
Merge "e2fsck missing from emulator"
Eric Frohnhoefer [Fri, 27 Dec 2013 04:02:34 +0000 (23:02 -0500)]
e2fsck missing from emulator
The emulator file system was recently switched to ext4 however, e2fsck was not
added to the emulator build.
Change-Id: I94621c148fa40d6042b5c86a26815d867a417a6c
See: https://code.google.com/p/android/issues/detail?id=64144
Michael Runge [Thu, 26 Dec 2013 23:33:32 +0000 (15:33 -0800)]
am
6b55f007: am
facd992e: Makefile used spaces instead of a tab
* commit '
6b55f00762c03b3625862b89f704090f58f970e7':
Makefile used spaces instead of a tab
Michael Runge [Thu, 26 Dec 2013 23:33:27 +0000 (15:33 -0800)]
am
a80542db: am
4038aa8f: Enabled incrementals to patch + rename moved files
* commit '
a80542dbf4f193c59525b8749871bcdf4ae4283a':
Enabled incrementals to patch + rename moved files
Stephen Smalley [Tue, 24 Dec 2013 16:34:28 +0000 (11:34 -0500)]
Allow execmem and ashmem_device execute as required.
bootanim requires execmem.
bootanim and surfaceflinger requires execute to ashmem_device.
Change-Id: I3b4964c5acd31a44ce81672077c70353a375c072
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Elliott Hughes [Fri, 20 Dec 2013 23:57:57 +0000 (15:57 -0800)]
am
b8559790: Merge "Remove a non-existent directory from the include path."
* commit '
b8559790d43f2483c7910e87e33ceebeb40e9bec':
Remove a non-existent directory from the include path.
Elliott Hughes [Fri, 20 Dec 2013 23:53:32 +0000 (23:53 +0000)]
Merge "Remove a non-existent directory from the include path."
Elliott Hughes [Fri, 20 Dec 2013 23:37:55 +0000 (15:37 -0800)]
Remove a non-existent directory from the include path.
Brings aarch64 in line with the other architectures.
Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
Nick Kralevich [Fri, 20 Dec 2013 21:06:07 +0000 (13:06 -0800)]
am
dfabbc68: Merge "Add policy for x86 emulator."
* commit '
dfabbc6863494374396a94181c408348824b37ab':
Add policy for x86 emulator.
Nick Kralevich [Fri, 20 Dec 2013 21:01:42 +0000 (21:01 +0000)]
Merge "Add policy for x86 emulator."
Michael Runge [Fri, 20 Dec 2013 20:36:49 +0000 (12:36 -0800)]
am
facd992e: Makefile used spaces instead of a tab
* commit '
facd992ec73de763cfbca32dd6aa38ff76a07613':
Makefile used spaces instead of a tab
Michael Runge [Fri, 20 Dec 2013 19:50:16 +0000 (11:50 -0800)]
Makefile used spaces instead of a tab
Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c
Michael Runge [Fri, 20 Dec 2013 19:35:07 +0000 (11:35 -0800)]
am
4038aa8f: Enabled incrementals to patch + rename moved files
* commit '
4038aa8fff8c68733bff8b55d8c8d1b59713ca37':
Enabled incrementals to patch + rename moved files
Stephen Smalley [Fri, 20 Dec 2013 18:26:11 +0000 (13:26 -0500)]
Add policy for x86 emulator.
Ying Wang [Thu, 19 Dec 2013 23:46:41 +0000 (15:46 -0800)]
am
3ccb437d: Merge "envsetup.sh: cd to toplevel in get_build_var"
* commit '
3ccb437d939b10d9ea10e01f37618028683ef669':
envsetup.sh: cd to toplevel in get_build_var
Ying Wang [Thu, 19 Dec 2013 23:42:28 +0000 (23:42 +0000)]
Merge "envsetup.sh: cd to toplevel in get_build_var"
Andrew Boie [Thu, 19 Dec 2013 21:21:46 +0000 (13:21 -0800)]
envsetup.sh: cd to toplevel in get_build_var
dumpvar doesn't work right if we're not called from the toplevel;
due to the way the build system works internally, -C does not
suffice. This was already done in get_abs_build_var.
Redundant -C calls removed since we're at the toplevel already.
Change-Id: Iaaa48982547d099186922cc3ddc417a82c85e9a5
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
David Friedman [Thu, 19 Dec 2013 21:53:54 +0000 (13:53 -0800)]
am
fc2f4343: am
612a88b7: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '
fc2f4343760976827e35d2b52d8f77d699879613':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
David Friedman [Thu, 19 Dec 2013 21:51:18 +0000 (21:51 +0000)]
am
612a88b7: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '
612a88b7faf5016138f6fbf70f1e89c993b0d2ab':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
David Friedman [Fri, 6 Dec 2013 10:23:14 +0000 (02:23 -0800)]
Added a row for the "All platforms" download line (rebuild stl with debug info package)
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
(cherry picked from commit
c25aee29298f1c1658fb274be15724ce60c0b93e)
Scott Main [Thu, 19 Dec 2013 21:15:19 +0000 (13:15 -0800)]
am
bf9d72ff: am
07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
* commit '
bf9d72ff4d6952c0546a2bf249938dfbe4f7768e':
set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
Scott Main [Thu, 19 Dec 2013 21:12:19 +0000 (21:12 +0000)]
am
07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
* commit '
078160410ad4209fb78f59ae8e04a6118914cdb5':
set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
Scott Main [Thu, 19 Dec 2013 20:47:38 +0000 (12:47 -0800)]
set fixed height for header div to ensure the next/prev links
in the training bar are always aligned with TOC
Change-Id: I34bb1967e3677bc94298837b0d8f0c6e7bcd8bbf
Elliott Hughes [Wed, 18 Dec 2013 23:35:58 +0000 (15:35 -0800)]
am
3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
* commit '
3d3dd4a186309a62a744d7fea1157158e05bcf6e':
Fix aarch64 and x86-64 AndroidConfig.h.
Elliott Hughes [Wed, 18 Dec 2013 23:31:46 +0000 (23:31 +0000)]
Merge "Fix aarch64 and x86-64 AndroidConfig.h."
Elliott Hughes [Wed, 18 Dec 2013 23:17:42 +0000 (15:17 -0800)]
Fix aarch64 and x86-64 AndroidConfig.h.
_LARGEFILE_SOURCE should never be defined with bionic.
_FILE_OFFSET_BITS should be 64 on 64-bit architectures.
Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522
Ying Wang [Wed, 18 Dec 2013 18:55:54 +0000 (10:55 -0800)]
am
8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
* commit '
8e3a71f75e08b4ad580903f2edc7edea5dc07806':
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
Ying Wang [Wed, 18 Dec 2013 18:51:50 +0000 (18:51 +0000)]
Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
Ying Wang [Thu, 14 Nov 2013 01:56:20 +0000 (17:56 -0800)]
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
Also this fixes the LOCAL_UNSTRIPPED_PATH if the module is installed to
the vendor dir via LOCAL_PROPRIETARY_MODULE.
Bug:
11289169
Change-Id: Ib07e5761411210963076487fe0e148c259e1e082
Ying Wang [Wed, 18 Dec 2013 01:45:32 +0000 (17:45 -0800)]
am
3fc636c2: Merge "Create the dest dir before copying over files."
* commit '
3fc636c25af0ddcce6ebe6f99a1d7ca83b84f69a':
Create the dest dir before copying over files.
Ying Wang [Wed, 18 Dec 2013 01:40:12 +0000 (01:40 +0000)]
Merge "Create the dest dir before copying over files."
Ying Wang [Wed, 18 Dec 2013 01:37:16 +0000 (17:37 -0800)]
Create the dest dir before copying over files.
Change-Id: I8ad79704558d7a10099e64fc1d032c8ddd3330b9
Ying Wang [Wed, 18 Dec 2013 00:58:43 +0000 (16:58 -0800)]
am
71e8a22e: Merge "Add DEXPREOPT support for ART"
* commit '
71e8a22e3478b6b4277957ef47486058a5306286':
Add DEXPREOPT support for ART
Ying Wang [Wed, 18 Dec 2013 00:55:28 +0000 (00:55 +0000)]
Merge "Add DEXPREOPT support for ART"
Christopher Ferris [Tue, 17 Dec 2013 23:11:58 +0000 (15:11 -0800)]
am
d12ee620: Merge "Re-enable uapi kernel headers for arm."
* commit '
d12ee620b064d262abce691771fe53ba8987d06f':
Re-enable uapi kernel headers for arm.
Christopher Ferris [Tue, 17 Dec 2013 23:06:38 +0000 (23:06 +0000)]
Merge "Re-enable uapi kernel headers for arm."
Brian Carlstrom [Fri, 15 Nov 2013 07:44:56 +0000 (23:44 -0800)]
Add DEXPREOPT support for ART
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
Scott Main [Tue, 17 Dec 2013 21:25:17 +0000 (13:25 -0800)]
am
dab6ac86: am
518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
* commit '
dab6ac86013bb9507a59b74abe1b11ab2306f352':
make the new guide/index.html the link for API Guides.
Scott Main [Tue, 17 Dec 2013 21:19:44 +0000 (21:19 +0000)]
am
518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
* commit '
518dc751a617c1f182cb01cdc8fd06076d1e91ba':
make the new guide/index.html the link for API Guides.
Scott Main [Tue, 17 Dec 2013 21:17:29 +0000 (21:17 +0000)]
Merge "make the new guide/index.html the link for API Guides." into klp-docs
Elliott Hughes [Tue, 17 Dec 2013 15:42:33 +0000 (07:42 -0800)]
am
3fd89533: Merge "Make aarch64 more like arm wrt strict-aliasing."
* commit '
3fd895336dc7cfe219be4e1d49096bf53e661503':
Make aarch64 more like arm wrt strict-aliasing.
Elliott Hughes [Tue, 17 Dec 2013 15:39:06 +0000 (15:39 +0000)]
Merge "Make aarch64 more like arm wrt strict-aliasing."
Elliott Hughes [Tue, 17 Dec 2013 02:01:19 +0000 (18:01 -0800)]
Make aarch64 more like arm wrt strict-aliasing.
All thumb code compiles with -fno-strict-aliasing. Let's not make aarch64
porting any more difficult than it needs to be.
Change-Id: I94874df1217b69532c328d7c86c9961631ebde8a
Christopher Ferris [Mon, 16 Dec 2013 21:58:39 +0000 (13:58 -0800)]
Re-enable uapi kernel headers for arm.
Bug:
11559337
Change-Id: Ib914e5f22b10d5a74edc357d42b0dcb223185ab4
Michael Runge [Sat, 14 Dec 2013 02:06:28 +0000 (18:06 -0800)]
Enabled incrementals to patch + rename moved files
Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
Christopher Ferris [Mon, 16 Dec 2013 18:33:03 +0000 (10:33 -0800)]
am
657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit '
657eadd4b78b91185ca2042ffb7f92be84e6c1c4':
Revert "Enable uapi kernel headers for arm."
Christopher Ferris [Mon, 16 Dec 2013 18:28:03 +0000 (18:28 +0000)]
Merge "Revert "Enable uapi kernel headers for arm.""
Christopher Ferris [Mon, 16 Dec 2013 18:21:27 +0000 (18:21 +0000)]
Revert "Enable uapi kernel headers for arm."
This reverts commit
88c6c533e17f7bc2e1491310b8d679a91b33aaeb.
Change-Id: I3cd84383c6f217bc6e627e16b2d0c7d948f8131d
Christopher Ferris [Mon, 16 Dec 2013 17:57:57 +0000 (09:57 -0800)]
am
84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '
84b99aadddf3cd9d02a60b43923ed11fc7341c9f':
Enable uapi kernel headers for arm.
Christopher Ferris [Mon, 16 Dec 2013 17:52:43 +0000 (17:52 +0000)]
Merge "Enable uapi kernel headers for arm."
Christopher Ferris [Mon, 16 Dec 2013 17:12:19 +0000 (09:12 -0800)]
Enable uapi kernel headers for arm.
Bug:
11559337
Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c
Ying Wang [Fri, 13 Dec 2013 18:24:12 +0000 (10:24 -0800)]
am
10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '
10b1ffaed921bce3014d39ca9dcb705550aa03f0':
enable PIE for dynamically linked Linux host executables
Ying Wang [Fri, 13 Dec 2013 18:16:26 +0000 (18:16 +0000)]
Merge "enable PIE for dynamically linked Linux host executables"
Joshua J. Drake [Thu, 12 Dec 2013 06:34:29 +0000 (00:34 -0600)]
enable PIE for dynamically linked Linux host executables
Compile all host programs for Android with -fPIE and -pie. This
enables PIE (Position Independent Executables), which helps
protect these applications from exploitation due to memory
management bugs.
Note: PIE *static* executables are not supported at this time. darwin
and windows are also not supported.
Change-Id: I67c1be297711ea23064c349f97ebd02eef3eff09
Ying Wang [Fri, 13 Dec 2013 00:09:43 +0000 (16:09 -0800)]
am
5859f105: Merge "Enable NX protections"
* commit '
5859f105fad3ce1ba76fb252c4c5b8fe357a3ce4':
Enable NX protections
Ying Wang [Fri, 13 Dec 2013 00:04:41 +0000 (00:04 +0000)]
Merge "Enable NX protections"
Christopher Ferris [Thu, 12 Dec 2013 21:57:55 +0000 (13:57 -0800)]
am
2c8078fd: Merge "Fix regex for finding symbol data."
* commit '
2c8078fdcc7741d848444a01cd81e5dfb8693f15':
Fix regex for finding symbol data.
Ben Cheng [Thu, 12 Dec 2013 21:57:55 +0000 (13:57 -0800)]
am
2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '
2609640eaea1ba89a493cff2847cb9ec993dc9fc':
Add an explicit definition of __ANDROID__=1
Christopher Ferris [Thu, 12 Dec 2013 21:53:08 +0000 (21:53 +0000)]
Merge "Fix regex for finding symbol data."
Ben Cheng [Thu, 12 Dec 2013 21:52:39 +0000 (21:52 +0000)]
Merge "Add an explicit definition of __ANDROID__=1"
Ben Cheng [Thu, 12 Dec 2013 21:07:05 +0000 (13:07 -0800)]
Add an explicit definition of __ANDROID__=1
Once the aarch64 toolchain is refreshed this will be removed.
Also removed some CFLAG duplications.
Change-Id: I42fd86931263af82042ea696196fb25e948fe9cb
Christopher Ferris [Thu, 12 Dec 2013 20:56:16 +0000 (12:56 -0800)]
Fix regex for finding symbol data.
The new output of debuggerd removed a space between the #00 and the rest
of the line. The regex is very restrictive, so fixing it to handle the new
output.
Change-Id: I5259ae1e56a351608b330dfd858a2021e6d89358
Joshua J. Drake [Thu, 12 Dec 2013 06:41:38 +0000 (00:41 -0600)]
Enable NX protections
Add -Wa,--noexecstack and -Wl,-z,noexecstack as default
flags when compiling host-side applications. This enables
NX protections, which prevent code from executing on the
stack or heap. NX protections make exploiting memory
corruption issues more challenging and is an important
security feature.
Change-Id: Iae580abe887e01f9029ec2a4e0fc0aae496724a4
Dirk Dougherty [Wed, 11 Dec 2013 23:27:50 +0000 (15:27 -0800)]
am
9b022bdf: am
35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '
9b022bdf8fba6fd3f2185a303e0bf3b3aa2e3d9e':
Doc change: Add tag for DevArt.
Dirk Dougherty [Wed, 11 Dec 2013 23:25:13 +0000 (23:25 +0000)]
am
35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '
35fe9894d283153b0a72741e207a586ff70cd558':
Doc change: Add tag for DevArt.
Dirk Dougherty [Wed, 11 Dec 2013 23:22:10 +0000 (23:22 +0000)]
Merge "Doc change: Add tag for DevArt." into klp-docs
Ying Wang [Wed, 11 Dec 2013 23:15:10 +0000 (15:15 -0800)]
am
d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
* commit '
d270230fa49311901d8797a9e77865c37857d028':
sign_target_files_apks: rewrite build.prop correctly in eng builds
Ying Wang [Wed, 11 Dec 2013 23:11:52 +0000 (23:11 +0000)]
Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
Andrew Boie [Wed, 11 Dec 2013 20:42:03 +0000 (12:42 -0800)]
sign_target_files_apks: rewrite build.prop correctly in eng builds
In eng builds, ro.display.id has many space separated items and was
resulting in an error when trying to rewrite it as 'value' gets
turned into a list and never converted back to a string.
Change-Id: I6c8633ed2eb52c56a4097992a32d53d80df4f844
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Ying Wang [Wed, 11 Dec 2013 18:11:21 +0000 (10:11 -0800)]
am
8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
* commit '
8a373fd5aef4eafbd716abe517a99ef0b3d69094':
Added TARGET_IS_64_BIT flag for x86_64 and aarch64
Ying Wang [Wed, 11 Dec 2013 17:52:26 +0000 (17:52 +0000)]
Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
Alexey Volkov [Wed, 11 Dec 2013 13:18:56 +0000 (17:18 +0400)]
Added TARGET_IS_64_BIT flag for x86_64 and aarch64
Change-Id: Ibdf9dafa3aeaf4b58b4a559ed05e36e2793bf6ed
Signed-off-by: Alexey Volkov <alexey.v.volkov@intel.com>
Scott Main [Thu, 5 Dec 2013 23:17:59 +0000 (15:17 -0800)]
make the new guide/index.html the link for API Guides.
Change-Id: I4423e9ab43b349427cc70211dd094760b35e9360
Scott Main [Tue, 10 Dec 2013 22:09:15 +0000 (14:09 -0800)]
am
ecff92d9: resolved conflicts for merge of
79a55d35 to klp-ub-dev
* commit '
ecff92d9f7d58b619465259213d7a58ae01c2872':
add Analytics event to track sample downloads (for real this time)
Scott Main [Tue, 10 Dec 2013 22:04:30 +0000 (14:04 -0800)]
resolved conflicts for merge of
79a55d35 to klp-ub-dev
Change-Id: I95f46942e03f125e1a907003520caaf6ab575016
Scott Main [Tue, 10 Dec 2013 21:52:37 +0000 (13:52 -0800)]
am
ea64d5de: am
719acb45: update search suggestions to use new unified JS and show samples
* commit '
ea64d5de02842233b3a163c9c707cc77ce06483c':
update search suggestions to use new unified JS and show samples
Scott Main [Tue, 10 Dec 2013 21:50:34 +0000 (21:50 +0000)]
am
719acb45: update search suggestions to use new unified JS and show samples
* commit '
719acb4553e1ffcbbe452ba7b3e8c6e5a12515db':
update search suggestions to use new unified JS and show samples
Ying Wang [Tue, 10 Dec 2013 19:36:18 +0000 (11:36 -0800)]
am
c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit '
c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266':
Add "-encoding UTF-8" option to javadoc.
Ying Wang [Tue, 10 Dec 2013 19:32:57 +0000 (19:32 +0000)]
Merge "Add "-encoding UTF-8" option to javadoc."
Ying Wang [Tue, 10 Dec 2013 19:29:25 +0000 (11:29 -0800)]
Add "-encoding UTF-8" option to javadoc.
This fixed docs build on Mac OS X 10.9 with Java 7.
Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
David Friedman [Tue, 10 Dec 2013 16:33:13 +0000 (08:33 -0800)]
am
c25aee29: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '
c25aee29298f1c1658fb274be15724ce60c0b93e':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
Scott Main [Tue, 10 Dec 2013 01:13:56 +0000 (17:13 -0800)]
add Analytics event to track sample downloads (for real this time)
Change-Id: I014fd31f0f12698462d44a8afed96ca6e3cfef38
Scott Main [Fri, 6 Dec 2013 00:05:09 +0000 (16:05 -0800)]
update search suggestions to use new unified JS and show samples
Change-Id: Id39091558906db7d43b2d07d09756f71d98502a7
David Friedman [Fri, 6 Dec 2013 10:23:14 +0000 (02:23 -0800)]
Added a row for the "All platforms" download line (rebuild stl with debug info package)
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
Narayan Kamath [Fri, 6 Dec 2013 17:16:18 +0000 (09:16 -0800)]
am
99bb0365: am
948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '
99bb0365d53186c8ece6ac4e61ca2d303d0e0f0a':
Fix tools path on Mac OS for java 7.