OSDN Git Service
Nick Kralevich [Fri, 30 May 2014 22:59:28 +0000 (22:59 +0000)]
am
329988c2: am
a42e0f50: Merge "arm64: restore relro/now"
* commit '
329988c277553621c40bbfff85e9848783992040':
arm64: restore relro/now
Nick Kralevich [Fri, 30 May 2014 22:56:11 +0000 (22:56 +0000)]
am
a42e0f50: Merge "arm64: restore relro/now"
* commit '
a42e0f50162721bc54c113ef1ed3058cfb38ae67':
arm64: restore relro/now
Nick Kralevich [Fri, 30 May 2014 22:52:34 +0000 (22:52 +0000)]
Merge "arm64: restore relro/now"
Nick Kralevich [Fri, 30 May 2014 22:45:24 +0000 (15:45 -0700)]
arm64: restore relro/now
The bug which required this option has been fixed.
Bug:
11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
Nick Kralevich [Fri, 30 May 2014 18:27:03 +0000 (18:27 +0000)]
am
1df5b37b: am
61cf065a: Merge "Use a separate policy for the recovery image."
* commit '
1df5b37b5b73324300ae1b5f255c1a772c65328a':
Use a separate policy for the recovery image.
Nick Kralevich [Fri, 30 May 2014 18:23:41 +0000 (18:23 +0000)]
am
61cf065a: Merge "Use a separate policy for the recovery image."
* commit '
61cf065ae9247a200208dc7df0234e03caff3605':
Use a separate policy for the recovery image.
Nick Kralevich [Fri, 30 May 2014 18:20:48 +0000 (18:20 +0000)]
Merge "Use a separate policy for the recovery image."
Andrew Hsieh [Fri, 30 May 2014 07:56:53 +0000 (07:56 +0000)]
am
dc41aa32: am
5c2c70de: Merge "Add -latomic to all target builds"
* commit '
dc41aa3254cbf443dd08c827e587cf261d1f7b82':
Add -latomic to all target builds
Andrew Hsieh [Fri, 30 May 2014 07:46:14 +0000 (07:46 +0000)]
am
5c2c70de: Merge "Add -latomic to all target builds"
* commit '
5c2c70de88a6c126460c88cfa64561d7cb2cc030':
Add -latomic to all target builds
Andrew Hsieh [Fri, 30 May 2014 07:44:00 +0000 (07:44 +0000)]
Merge "Add -latomic to all target builds"
Scott Main [Thu, 29 May 2014 22:59:57 +0000 (22:59 +0000)]
am
04f811c8: am
573db58e: am
ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit '
04f811c80e2d32e88f73b7d7866da1e9ed699786':
update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
Scott Main [Thu, 29 May 2014 22:54:12 +0000 (22:54 +0000)]
am
573db58e: am
ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit '
573db58ef78a1cd80845204c6e5141a6205aa305':
update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
Scott Main [Thu, 29 May 2014 22:42:16 +0000 (22:42 +0000)]
am
ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit '
ea98c8413390cf228d4c16fc35a7fdc92109eded':
update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
Scott Main [Thu, 29 May 2014 22:33:55 +0000 (22:33 +0000)]
Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
Dave Allison [Thu, 29 May 2014 21:06:26 +0000 (21:06 +0000)]
am
f4115cdf: am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
f4115cdfac6bfde8e3d7cab1e7782d078d764209':
Add libsigchain to the embedded.mk makefile
Brian Carlstrom [Thu, 29 May 2014 21:06:19 +0000 (21:06 +0000)]
am
ab6f84e3: am
e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit '
ab6f84e3d1886237e9516ebe4660d8e1042a6a75':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 21:01:24 +0000 (14:01 -0700)]
resolved conflicts for merge of
2267c22b to klp-modular-dev-plus-aosp
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
Stephen Smalley [Thu, 29 May 2014 20:41:03 +0000 (16:41 -0400)]
Use a separate policy for the recovery image.
Only the recovery image needs to include the recovery domain
in its policy, so create a separate policy for the recovery image
and replace the root policy with this one when building the
recovery image.
Depends on the change with the same Change-Id in external/sepolicy.
Change-Id: I444107f9821eabf4164ba07a44d03bd71e719989
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Dave Allison [Thu, 29 May 2014 19:57:50 +0000 (19:57 +0000)]
am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
2a2ba735df028a6168368a399b6df27a6ec33fa4':
Add libsigchain to the embedded.mk makefile
Dave Allison [Thu, 29 May 2014 19:51:50 +0000 (19:51 +0000)]
Merge "Add libsigchain to the embedded.mk makefile"
Brian Carlstrom [Thu, 29 May 2014 19:40:02 +0000 (19:40 +0000)]
am
e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit '
e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 19:39:49 +0000 (19:39 +0000)]
am
f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
f2a2406b8c01e71603feaa5eaccd75d26ea76804':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:36:37 +0000 (19:36 +0000)]
Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
Brian Carlstrom [Thu, 29 May 2014 19:36:35 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Andrew Hsieh [Thu, 29 May 2014 09:47:27 +0000 (02:47 -0700)]
Add -latomic to all target builds
Projects using stdatomic.h needs libatomic.a in case compiler can't
expand all __atomic* intrinsics. eg, __atomic_is_lock_free in
armeabi/mips.
Adding libatomic.a globally makes more sense than adding
"LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>.
Projects don't need atomic operations won't get redundant DT_NEEDED
entry because libatomic.a is not a shared library.
Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
Brian Carlstrom [Thu, 29 May 2014 05:13:07 +0000 (22:13 -0700)]
Only enable WITH_DEXPREOPT by default for libdvm.so
Bug:
14298175
(cherry picked from commit
9f8e214a919097284a88cb19a1b85ceafc202a67)
Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
bf8a374a92e327efed95892fe67e6917a89c6c2b)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
Ying Wang [Wed, 28 May 2014 23:41:42 +0000 (23:41 +0000)]
am
d3ddfdf8: am
b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
* commit '
d3ddfdf847eaf44219943cda441273be85b01635':
Add a dummy build recipe for generated RS cpp files.
Ying Wang [Wed, 28 May 2014 23:38:46 +0000 (23:38 +0000)]
am
b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
* commit '
b3bed5952b44e69dc9e1988beb4092303084ef61':
Add a dummy build recipe for generated RS cpp files.
Ying Wang [Wed, 28 May 2014 23:33:35 +0000 (23:33 +0000)]
Merge "Add a dummy build recipe for generated RS cpp files."
Ying Wang [Wed, 28 May 2014 23:31:02 +0000 (23:31 +0000)]
am
d40776aa: am
65afd710: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
d40776aa8800d62a182eeed82c3ac1cef90e69ab':
Add a dummy build recipe for the proto generated header files
Ying Wang [Wed, 28 May 2014 23:28:58 +0000 (23:28 +0000)]
am
65afd710: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
65afd710a592390671beb5da15a87b127a5f2125':
Add a dummy build recipe for the proto generated header files
Ying Wang [Wed, 28 May 2014 23:26:01 +0000 (23:26 +0000)]
Merge "Add a dummy build recipe for the proto generated header files"
Ying Wang [Wed, 28 May 2014 23:17:09 +0000 (16:17 -0700)]
Add a dummy build recipe for generated RS cpp files.
Previously the RS cpp files are generated by the timestamp rule. Though
we have the generated RS cpp files depend on the timestamp file, we
don't have a build recipe. In such case gmake does some "optimization"
that it skip recompiling the generated cpp files, because it assumes the
generated cpp files are already up to date even if the rs files have
been updated.
Bug:
15313144
Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
Ying Wang [Fri, 14 Feb 2014 02:04:00 +0000 (18:04 -0800)]
Add a dummy build recipe for the proto generated header files
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.
Bug:
13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
Brian Carlstrom [Wed, 28 May 2014 23:13:28 +0000 (23:13 +0000)]
am
ed97938c: am
7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
ed97938caa7a1e7cde1d060ebbe6f6af1279188e':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:31:44 +0000 (22:31 +0000)]
am
7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:35 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:46 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
7e127ebe0bf8753fcbeeac6140916d512322e308)
Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
Ying Wang [Wed, 28 May 2014 21:31:19 +0000 (21:31 +0000)]
am
8898f2e2: am
f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit '
8898f2e261d1bb2b389971803a1f4a23639ade9e':
Fix pattern rules for $(installed_odex) for libdvm.
Ying Wang [Wed, 28 May 2014 21:28:42 +0000 (21:28 +0000)]
am
f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit '
f4999d3b8a0d09e790767176c543df1c2ad53c5a':
Fix pattern rules for $(installed_odex) for libdvm.
Ying Wang [Wed, 28 May 2014 21:25:34 +0000 (21:25 +0000)]
Merge "Fix pattern rules for $(installed_odex) for libdvm."
Ying Wang [Wed, 28 May 2014 20:34:59 +0000 (13:34 -0700)]
Fix pattern rules for $(installed_odex) for libdvm.
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.
Bug:
15311527
Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
Ying Wang [Wed, 28 May 2014 16:18:56 +0000 (16:18 +0000)]
am
7e4c73d5: am
aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit '
7e4c73d5885402f5c301309094ce3dbceef0ecd3':
Support LOCAL_CLANG with arch/bit suffix.
Ying Wang [Wed, 28 May 2014 16:14:54 +0000 (16:14 +0000)]
am
aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit '
aae7e3fa66ecf6bf796ba9a107d8f066498ab10b':
Support LOCAL_CLANG with arch/bit suffix.
Ying Wang [Wed, 28 May 2014 16:12:39 +0000 (16:12 +0000)]
Merge "Support LOCAL_CLANG with arch/bit suffix."
Elliott Hughes [Wed, 28 May 2014 04:07:39 +0000 (04:07 +0000)]
am
ad319779: am
4afe808c: Merge "Fix all the system image sizes."
* commit '
ad319779ff31f9c03b05b65ae84bc2b81ba0d9ee':
Fix all the system image sizes.
Elliott Hughes [Wed, 28 May 2014 04:04:36 +0000 (04:04 +0000)]
am
4afe808c: Merge "Fix all the system image sizes."
* commit '
4afe808c640ac2bfdd1e665d322b7c9fbe38a974':
Fix all the system image sizes.
Elliott Hughes [Wed, 28 May 2014 04:01:52 +0000 (04:01 +0000)]
Merge "Fix all the system image sizes."
Elliott Hughes [Tue, 27 May 2014 23:47:44 +0000 (16:47 -0700)]
Fix all the system image sizes.
x86 just bit me. I did manage to build mips today, but I assume it
can't be long before we hit the limit there too if every other target
has hit it already.
Change-Id: I28dfe3b4f9565cb79e0bf6b0ffc55a9d6e64a9b0
Ying Wang [Tue, 27 May 2014 20:03:36 +0000 (13:03 -0700)]
Support LOCAL_CLANG with arch/bit suffix.
Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG.
Bug:
15257067
Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
Dan Albert [Tue, 27 May 2014 19:47:08 +0000 (19:47 +0000)]
am
a5b0b130: am
3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '
a5b0b1303d38fb1cd31575383c647eb8b1db5e36':
Revert "Fix for duplicate names in whole static libs"
Dan Albert [Tue, 27 May 2014 19:44:19 +0000 (19:44 +0000)]
am
3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '
3805f619156163eab8ad92fd51b4a431be1287bd':
Revert "Fix for duplicate names in whole static libs"
Dan Albert [Tue, 27 May 2014 19:41:46 +0000 (19:41 +0000)]
Merge "Revert "Fix for duplicate names in whole static libs""
Dan Albert [Tue, 27 May 2014 19:30:36 +0000 (19:30 +0000)]
Revert "Fix for duplicate names in whole static libs"
This reverts commit
0e5ce8be34446278a3404ea2a4afc01f20f86c5a.
Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
Dan Albert [Tue, 27 May 2014 18:30:08 +0000 (18:30 +0000)]
am
212772f6: am
31101623: Merge "Fix for duplicate names in whole static libs"
* commit '
212772f6322ef41a1b18023d15eb2b69efa19be8':
Fix for duplicate names in whole static libs
Dan Albert [Tue, 27 May 2014 18:26:38 +0000 (18:26 +0000)]
am
31101623: Merge "Fix for duplicate names in whole static libs"
* commit '
31101623b3e621436f6b46f49242ed4642d86164':
Fix for duplicate names in whole static libs
Dan Albert [Tue, 27 May 2014 18:23:26 +0000 (18:23 +0000)]
Merge "Fix for duplicate names in whole static libs"
Ying Wang [Tue, 27 May 2014 17:55:35 +0000 (17:55 +0000)]
am
29267309: am
294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '
292673094c59bf235a8ba188c2736199f6082105':
Exclude libstdc++ and libgcc if libc++ is requested.
Ying Wang [Tue, 27 May 2014 17:52:10 +0000 (17:52 +0000)]
am
294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '
294301bb34b62d51305d70780ac031a905fa9efe':
Exclude libstdc++ and libgcc if libc++ is requested.
Ying Wang [Tue, 27 May 2014 17:49:12 +0000 (17:49 +0000)]
Merge "Exclude libstdc++ and libgcc if libc++ is requested."
Narayan Kamath [Tue, 27 May 2014 11:23:34 +0000 (11:23 +0000)]
am
6c2ae327: am
8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '
6c2ae327665396958ba6f08dc72bc30b3455d046':
Switch x86_64 emulator to 64 bit primary.
Narayan Kamath [Tue, 27 May 2014 11:21:22 +0000 (12:21 +0100)]
resolved conflicts for merge of
0f99bb3d to klp-modular-dev-plus-aosp
Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
Narayan Kamath [Tue, 27 May 2014 11:15:57 +0000 (11:15 +0000)]
am
8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '
8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
Switch x86_64 emulator to 64 bit primary.
Narayan Kamath [Tue, 27 May 2014 11:15:56 +0000 (11:15 +0000)]
am
7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
* commit '
7b31bd3e8f25b9b232204d4b64399d78d6e41163':
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
Narayan Kamath [Tue, 27 May 2014 11:13:42 +0000 (11:13 +0000)]
Merge "Switch x86_64 emulator to 64 bit primary."
Narayan Kamath [Tue, 27 May 2014 11:12:33 +0000 (11:12 +0000)]
Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
Narayan Kamath [Wed, 21 May 2014 11:44:37 +0000 (12:44 +0100)]
Switch x86_64 emulator to 64 bit primary.
Also siezes the opportunity to remove the hardcoded
TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk.
This avoids the need for further hacks but needs supporting
changes to a few apps to force them to 32 bit.
Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
Narayan Kamath [Tue, 6 May 2014 14:14:09 +0000 (15:14 +0100)]
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
(cherry picked from commit
7b9347a7f9d870e149ef38438ad547abe2709ee2)
Change-Id: If459eab32c6e7831596224ad3503baefbf028133
Dan Albert [Fri, 23 May 2014 17:41:29 +0000 (10:41 -0700)]
Fix for duplicate names in whole static libs
_extract-and-include-single-(host|target)-whole-static-lib was written such that
only the first file of a given name would be extracted and included into the new
library. This patch iterates over each identically named archive member,
extracts them individually, and adds them to the new archive.
Bug:
15110069
Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1
Ying Wang [Fri, 23 May 2014 23:42:37 +0000 (16:42 -0700)]
Exclude libstdc++ and libgcc if libc++ is requested.
Bug:
15174002
Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
Scott Main [Fri, 23 May 2014 21:57:59 +0000 (21:57 +0000)]
am
ed02b7fb: am
8b2be3d8: am
f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '
ed02b7fb1219de39adbec8ad432684822e37e320':
fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
Scott Main [Fri, 23 May 2014 21:52:47 +0000 (21:52 +0000)]
am
8b2be3d8: am
f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '
8b2be3d81d780e0549907b58ebf860e0cbbabd07':
fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
Scott Main [Fri, 23 May 2014 21:49:16 +0000 (21:49 +0000)]
am
f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '
f525781ea843cd6518f45c0146074e335b942a2a':
fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
Ying Wang [Fri, 23 May 2014 17:48:27 +0000 (17:48 +0000)]
am
cdcb6926: am
6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '
cdcb6926d40b502ed89a285cdd4d99beb4cf8009':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
Ying Wang [Fri, 23 May 2014 17:44:31 +0000 (17:44 +0000)]
am
6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '
6cb69bd4f20ac3ae3a7d5b5cc323c4480cf8ef75':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
Ying Wang [Fri, 23 May 2014 17:39:40 +0000 (17:39 +0000)]
Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
Scott Main [Fri, 23 May 2014 00:42:39 +0000 (00:42 +0000)]
am
e2808370: am
c0387cd0: am
e7d75351: when generating training course pages, use localized descriptions when available
* commit '
e280837053708f85520574c3ccb36be3e367a255':
when generating training course pages, use localized descriptions when available
Scott Main [Fri, 23 May 2014 00:38:23 +0000 (00:38 +0000)]
am
c0387cd0: am
e7d75351: when generating training course pages, use localized descriptions when available
* commit '
c0387cd0f156b9e657e72ca2e24d402e5e0fe57c':
when generating training course pages, use localized descriptions when available
Scott Main [Fri, 23 May 2014 00:33:59 +0000 (00:33 +0000)]
am
e7d75351: when generating training course pages, use localized descriptions when available
* commit '
e7d75351a9918716e75db57cc04baa46a64bf447':
when generating training course pages, use localized descriptions when available
Scott Main [Fri, 23 May 2014 00:26:38 +0000 (17:26 -0700)]
fix regression with horizontal scroll so the sidenav moves
with the rest of the content when the sticky bar is visible
Change-Id: I6c310405c15a8f74719b895f14eb5f4780277845
Scott Main [Thu, 22 May 2014 22:50:56 +0000 (15:50 -0700)]
when generating training course pages, use localized descriptions when available
Change-Id: I1b5078e04b440bf5dff71dc31333bcf1d2202ff9
Colin Cross [Thu, 22 May 2014 19:36:15 +0000 (19:36 +0000)]
am
828b5183: am
e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '
828b518377f69516ea6cbb9ad160d81ced6980d5':
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:31:26 +0000 (19:31 +0000)]
am
e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '
e45c8607b3e2cf7a428a91898aea2752a54389a1':
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:28:01 +0000 (19:28 +0000)]
Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* changes:
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:01:23 +0000 (12:01 -0700)]
set a prebuilt directory name for the 2nd arch
In order to install 32-bit gdbserver on a 64-bit build,
prebuilts/misc/Android.mk needs to know the prebuilt directory name
for the 2nd arch.
Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
Colin Cross [Thu, 22 May 2014 18:59:10 +0000 (11:59 -0700)]
add vendor directories to gdb shared library search path
Change-Id: Ib4ccf3739d6b2f14597605ce06f00e4776f67976
Colin Cross [Thu, 22 May 2014 18:58:40 +0000 (11:58 -0700)]
add 2nd arch gcc to the path
Add the 2nd arch gcc to the path so users can manually run gdb,
addr2line, objdump, etc.
Change-Id: I30ff439bb6548b897d13bfa87151991d5f2948b3
Colin Cross [Thu, 22 May 2014 18:57:43 +0000 (11:57 -0700)]
fix paths when 2nd arch gcc is a different version
arm64 is using gcc 4.9, arm is using gcc 4.8. Fix setpaths() to
get a separate version for the 2nd arch.
Change-Id: I7bde01308fc7718360e7d0fbd46b3ae8c5f55fa7
Scott Main [Tue, 20 May 2014 03:33:24 +0000 (20:33 -0700)]
update css for header offset alignment
and remove obsolete h1 styles for distribute docs.
cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
Change-Id: I9dc175057b6e452cc2754a7da0ee73179c6e8299
Ying Wang [Thu, 22 May 2014 17:47:40 +0000 (17:47 +0000)]
am
8e2b2d8a: am
b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
* commit '
8e2b2d8ad4040d501d4d254cd359cf17ea32bbdd':
Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
Ying Wang [Thu, 22 May 2014 17:43:14 +0000 (17:43 +0000)]
am
b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
* commit '
b0143e2fffbd3183175e8c1873d3466598ca9457':
Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
Ying Wang [Thu, 22 May 2014 17:38:01 +0000 (17:38 +0000)]
Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
Scott Main [Thu, 22 May 2014 15:01:51 +0000 (15:01 +0000)]
am
0250f80e: am
e8a3139e: am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
0250f80ef0708e9ba71a77cffb29afb2356a5d25':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Scott Main [Thu, 22 May 2014 14:58:15 +0000 (14:58 +0000)]
am
e8a3139e: am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
e8a3139ebfa103ff2b0ae1dd98abe37186ecbaad':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Scott Main [Thu, 22 May 2014 14:51:08 +0000 (14:51 +0000)]
am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
b16376f2e600008c0d7233a919edf02a30237a9a':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Scott Main [Thu, 22 May 2014 03:35:47 +0000 (20:35 -0700)]
Change scroll position with javascript instead of CSS.
Makes scroll adjustment work for all types of anchors.
bug:
15129373
Change-Id: I0f934170613e8a60d94f09192e03117b8e9d4852
Ying Wang [Thu, 22 May 2014 02:34:02 +0000 (02:34 +0000)]
am
a72e6f80: am
8a3f514d: Merge "Split the rules to build the odex file"
* commit '
a72e6f80e447acf225822eebdf752c0d8aa2590c':
Split the rules to build the odex file
Ying Wang [Thu, 22 May 2014 02:29:52 +0000 (02:29 +0000)]
am
8a3f514d: Merge "Split the rules to build the odex file"
* commit '
8a3f514d44e2c1d4920126b3edd47f7a7616b732':
Split the rules to build the odex file
Ying Wang [Thu, 22 May 2014 02:24:59 +0000 (02:24 +0000)]
Merge "Split the rules to build the odex file"