Commit graph

18447 commits

Author SHA1 Message Date
Elliott Hughes
7c9a8e6400 am 55b2c360: am ad319779: am 4afe808c: Merge "Fix all the system image sizes."
* commit '55b2c3600fcbdc6bd0dbf3319eb219188553429c':
  Fix all the system image sizes.
2014-05-28 18:01:54 +00:00
Rick Zhang
6eea8e25fd add moto to vendor owner whitelist
Change-Id: I63760a380a17fe096c2aff1133bba336ac8bd7f1
2014-05-28 10:31:30 -07:00
Ying Wang
536d4a761b am 7e4c73d5: am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit '7e4c73d5885402f5c301309094ce3dbceef0ecd3':
  Support LOCAL_CLANG with arch/bit suffix.
2014-05-28 16:18:56 +00:00
Ying Wang
7e4c73d588 am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit 'aae7e3fa66ecf6bf796ba9a107d8f066498ab10b':
  Support LOCAL_CLANG with arch/bit suffix.
2014-05-28 16:14:54 +00:00
Ying Wang
aae7e3fa66 Merge "Support LOCAL_CLANG with arch/bit suffix." 2014-05-28 16:12:40 +00:00
Vineeta Srivastava
1bd266d006 Merge "Add 'qti' to vendor whitelist" 2014-05-28 15:40:19 +00:00
Elliott Hughes
55b2c3600f am ad319779: am 4afe808c: Merge "Fix all the system image sizes."
* commit 'ad319779ff31f9c03b05b65ae84bc2b81ba0d9ee':
  Fix all the system image sizes.
2014-05-28 04:07:39 +00:00
Elliott Hughes
ad319779ff am 4afe808c: Merge "Fix all the system image sizes."
* commit '4afe808c640ac2bfdd1e665d322b7c9fbe38a974':
  Fix all the system image sizes.
2014-05-28 04:04:36 +00:00
Elliott Hughes
4afe808c64 Merge "Fix all the system image sizes." 2014-05-28 04:01:53 +00:00
Elliott Hughes
368600b1e8 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
2014-05-27 16:47:44 -07:00
Ajay Dudani
37a4b4ded9 Add 'qti' to vendor whitelist
Bug: 15287127
Change-Id: I4440fb0428a345edb782888fe278b8fd6d809b5d
2014-05-27 14:51:51 -07:00
Jeff Brown
bf59b8b340 Merge "Support more precise package exclusion from JAR files." 2014-05-27 21:46:57 +00:00
Ying Wang
824344af00 Support LOCAL_CLANG with arch/bit suffix.
Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG.

Bug: 15257067
Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
2014-05-27 13:06:08 -07:00
Dan Albert
49df673669 am cd74f307: am a5b0b130: am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit 'cd74f3073c4d0fa7d566705b0eb38c635c1c9344':
  Revert "Fix for duplicate names in whole static libs"
2014-05-27 19:50:55 +00:00
Dan Albert
cd74f3073c 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"
2014-05-27 19:47:08 +00:00
Dan Albert
a5b0b1303d am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '3805f619156163eab8ad92fd51b4a431be1287bd':
  Revert "Fix for duplicate names in whole static libs"
2014-05-27 19:44:19 +00:00
Dan Albert
3805f61915 Merge "Revert "Fix for duplicate names in whole static libs"" 2014-05-27 19:41:46 +00:00
Dan Albert
3c12b5c02b Revert "Fix for duplicate names in whole static libs"
This reverts commit 0e5ce8be34.

Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
2014-05-27 19:30:36 +00:00
Dan Albert
d8303d9021 am e6918b55: am 212772f6: am 31101623: Merge "Fix for duplicate names in whole static libs"
* commit 'e6918b559d911fd58dc03b60e4b866b23c935f72':
  Fix for duplicate names in whole static libs
2014-05-27 18:33:19 +00:00
Dan Albert
e6918b559d am 212772f6: am 31101623: Merge "Fix for duplicate names in whole static libs"
* commit '212772f6322ef41a1b18023d15eb2b69efa19be8':
  Fix for duplicate names in whole static libs
2014-05-27 18:30:08 +00:00
Dan Albert
212772f632 am 31101623: Merge "Fix for duplicate names in whole static libs"
* commit '31101623b3e621436f6b46f49242ed4642d86164':
  Fix for duplicate names in whole static libs
2014-05-27 18:26:38 +00:00
Dan Albert
31101623b3 Merge "Fix for duplicate names in whole static libs" 2014-05-27 18:23:26 +00:00
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