Commit graph

18424 commits

Author SHA1 Message Date
Ying Wang
bccdab8737 am 65475feb: am 29267309: am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '65475feb5999068096b287faac9199d1c8e18340':
  Exclude libstdc++ and libgcc if libc++ is requested.
2014-05-27 17:59:11 +00:00
Ying Wang
65475feb59 am 29267309: am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '292673094c59bf235a8ba188c2736199f6082105':
  Exclude libstdc++ and libgcc if libc++ is requested.
2014-05-27 17:55:35 +00:00
Ying Wang
292673094c am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '294301bb34b62d51305d70780ac031a905fa9efe':
  Exclude libstdc++ and libgcc if libc++ is requested.
2014-05-27 17:52:10 +00:00
Ying Wang
294301bb34 Merge "Exclude libstdc++ and libgcc if libc++ is requested." 2014-05-27 17:49:13 +00:00
Guang Zhu
a8b7f72055 am 212bc327: fix build id
* commit '212bc3271a4af9f64e7d9f893b54a18127a52bcf':
  fix build id
2014-05-27 17:23:53 +00:00
Guang Zhu
212bc3271a fix build id
Bug: 15264432

Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
(cherry picked from commit 44e1b0bd8a)
2014-05-27 17:21:00 +00:00
Guang Zhu
5b257bb4ab Merge "fix build id" 2014-05-27 17:18:49 +00:00
Narayan Kamath
7d55bea91f resolved conflicts for merge of 38c3c930 to master
Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
2014-05-27 12:29:41 +01:00
Narayan Kamath
cc25436841 am 06db7324: resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp
* commit '06db73241a12a6b5f352647e966d254ae6443f68':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.
2014-05-27 11:23:39 +00:00
Narayan Kamath
38c3c9309f am 6c2ae327: am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '6c2ae327665396958ba6f08dc72bc30b3455d046':
  Switch x86_64 emulator to 64 bit primary.
2014-05-27 11:23:34 +00:00
Narayan Kamath
06db73241a resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp
Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
2014-05-27 12:21:22 +01:00
Narayan Kamath
6c2ae32766 am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
  Switch x86_64 emulator to 64 bit primary.
2014-05-27 11:15:57 +00:00
Narayan Kamath
0f99bb3d0b am 7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
* commit '7b31bd3e8f25b9b232204d4b64399d78d6e41163':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.
2014-05-27 11:15:56 +00:00
Narayan Kamath
8d3b9c9e45 Merge "Switch x86_64 emulator to 64 bit primary." 2014-05-27 11:13:42 +00:00
Narayan Kamath
7b31bd3e8f Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS." 2014-05-27 11:12:34 +00:00
Narayan Kamath
62da5fd161 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
2014-05-27 12:12:00 +01:00
Narayan Kamath
214c53a022 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 7b9347a7f9)

Change-Id: If459eab32c6e7831596224ad3503baefbf028133
2014-05-27 12:08:33 +01:00
Guang Zhu
44e1b0bd8a fix build id
Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
2014-05-26 22:06:13 -07:00
Jeff Brown
4c4aa99ced Support more precise package exclusion from JAR files.
Allow LOCAL_JAR_PACKAGES to work on subpackages.  Previously it
only worked on top-level packages due to a bug in how the directories
were recursively deleted.

Add LOCAL_JAR_EXCLUDE_PACKAGES to allow specific subpackages to
be excluded.  This rule applies after LOCAL_JAR_PACKAGES has
selected which packages to include.  It may also be used independently.

Change-Id: Ibd0e495be1a20c84b59c9da132e92100ef3f8705
2014-05-23 18:41:19 -07:00
Dan Albert
0e5ce8be34 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
2014-05-23 18:23:47 -07:00
Ying Wang
d90de32951 Exclude libstdc++ and libgcc if libc++ is requested.
Bug: 15174002
Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
2014-05-23 16:42:37 -07:00
Scott Main
8c980422e3 am bcdbb68a: 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 'bcdbb68a9b0466136af0b4c9d5b46d4b6343cc2d':
  fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
2014-05-23 22:05:38 +00:00
Scott Main
bcdbb68a9b 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
2014-05-23 21:57:59 +00:00
Scott Main
ed02b7fb12 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
2014-05-23 21:52:47 +00:00
Scott Main
8b2be3d81d 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
2014-05-23 21:49:16 +00:00
Ying Wang
1dc4f0bace am 2bf10a72: am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '2bf10a72f87a8e97923286aa331f7db81e2361ca':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
2014-05-23 19:43:57 +00:00
Scott Main
554cd62ffa am 8758e0cd: am e2808370: am c0387cd0: am e7d75351: when generating training course pages, use localized descriptions when available
* commit '8758e0cdf0f9d41c420ef64c8362788707fd378c':
  when generating training course pages, use localized descriptions when available
2014-05-23 19:34:28 +00:00
The Android Automerger
543644393b am d7a59dd0: "AAV52B"
* commit 'd7a59dd0ebdabaea5f9f3fd91ff86e18d2beebf7':
  "AAV52B"
2014-05-23 18:22:17 +00:00
The Android Automerger
161bc1abd3 am c64d2a5b: merge in master-release history after reset to 87b6b24f86
* commit 'c64d2a5b7779be797ce4bdaa8ba5eb3e3165fb33': (312 commits)
  "AAV52"
  "AAV51B"
  "AAV51"
  AAV50C
  "AAV50B"
  "AAV50"
  "AAV49B"
  Fix salt for verity tree generation.
  "AAV49"
  "AAV48"
  "AAV47"
  AAV45F
  "AAV45E"
  "AAV45D"
  "AAV45C"
  "AAV45B"
  "AAV45"
  "AAV44C"
  AAV44B
  "AAV44"
  ...
2014-05-23 18:22:16 +00:00
Ying Wang
2bf10a72f8 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
2014-05-23 17:48:27 +00:00
Ying Wang
cdcb6926d4 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
2014-05-23 17:44:31 +00:00
Ying Wang
6cb69bd4f2 Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 2014-05-23 17:39:40 +00:00
Scott Main
8758e0cdf0 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
2014-05-23 00:42:39 +00:00
Scott Main
e280837053 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
2014-05-23 00:38:23 +00:00
Scott Main
c0387cd0f1 am e7d75351: when generating training course pages, use localized descriptions when available
* commit 'e7d75351a9918716e75db57cc04baa46a64bf447':
  when generating training course pages, use localized descriptions when available
2014-05-23 00:33:59 +00:00
Scott Main
f525781ea8 fix regression with horizontal scroll so the sidenav moves
with the rest of the content when the sticky bar is visible

Change-Id: I6c310405c15a8f74719b895f14eb5f4780277845
2014-05-22 17:30:43 -07:00
Scott Main
e7d75351a9 when generating training course pages, use localized descriptions when available
Change-Id: I1b5078e04b440bf5dff71dc31333bcf1d2202ff9
2014-05-22 16:23:48 -07:00
Colin Cross
949ed75bb9 am 423242b5: am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '423242b59ea01dffbb7f79c7c045528f7c351c4b':
  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
2014-05-22 19:40:46 +00:00
Colin Cross
423242b59e 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
2014-05-22 19:36:15 +00:00
Colin Cross
828b518377 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
2014-05-22 19:31:26 +00:00
Colin Cross
e45c8607b3 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
2014-05-22 19:28:01 +00:00
Colin Cross
12d18eb563 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
2014-05-22 12:01:23 -07:00
Colin Cross
3655a68565 add vendor directories to gdb shared library search path
Change-Id: Ib4ccf3739d6b2f14597605ce06f00e4776f67976
2014-05-22 12:01:06 -07:00
Colin Cross
6a5fa0684a 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
2014-05-22 12:01:06 -07:00
Colin Cross
03b424a50b 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
2014-05-22 12:01:06 -07:00
Scott Main
91b555710c update css for header offset alignment
and remove obsolete h1 styles for distribute docs.
cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0

Change-Id: I9dc175057b6e452cc2754a7da0ee73179c6e8299
2014-05-22 11:30:14 -07:00
Ying Wang
ae9ee9c0e7 am 71617605: am 8e2b2d8a: am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
* commit '716176059ab8962c7049f91c83c82b1af9f2632a':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
2014-05-22 18:28:06 +00:00
Scott Main
501cf291d0 am 6433592a: 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 '6433592aecbfd2aa40a9395866be23ae04c36f63':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
2014-05-22 18:01:18 +00:00
Ying Wang
716176059a 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
2014-05-22 17:47:40 +00:00
Ying Wang
8e2b2d8ad4 am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
* commit 'b0143e2fffbd3183175e8c1873d3466598ca9457':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
2014-05-22 17:43:14 +00:00