tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19131 commits 1 branch 0 tags 119 MiB
Commit graph

5155 commits

Author SHA1 Message Date
Neil Fuller
c61caf11a0 Fix the CTS build now that core is gone 
Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8
 2014-06-19 11:26:54 +01:00
Ying Wang
c8bdce1a72 Merge "Create symlink /system/vendor if necessary." 2014-06-17 21:43:29 +00:00
Neil Fuller
50f0eab1cd am cc317c40: am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone" 
* commit 'cc317c40d3c087725e4ab9926ad83903495cd7c5':
  Fix the CTS build now that core is gone
 2014-06-19 10:43:40 +00:00
Ying Wang
23898df867 Create symlink /system/vendor if necessary. 
Bug: 15728378
Change-Id: I0fe621096bb264882dc1b6face7440298fb56af0
 2014-06-18 20:26:24 -07:00
Ying Wang
bfc7fb23ee am 451dbd7c: am cc2e90e6: am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH." 
* commit '451dbd7c006177edb56fc5036ae8c3c110c5f2fd':
  Rewrite the clean steps for TARGET_2ND_ARCH.
 2014-06-18 23:03:26 +00:00
Colin Cross
bf2f0c729b am a1ac4736: am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist" 
* commit 'a1ac47367636c0473156679f8f30af626df7da85':
  build: delete 64-bit blacklist
 2014-06-18 21:40:27 +00:00
Ying Wang
69c27d9ad9 am 88440c53: am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG." 
* commit '88440c536ba0cfdd42e88378c952eb56f918f4a8':
  Use the correct MKBOOTIMG.
 2014-06-18 21:09:30 +00:00
Narayan Kamath
6db9e1c887 Merge changes Ib9d1863c,I2a6eb327 
* changes:
  SDK targets should inherit from core_64_bit.mk
  Fix issue in symlinking 64 bit executables.
 2014-06-17 21:55:55 +00:00
Colin Cross
1e961acf0c pdk: add core-libart_intermediates 
Add out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates
to platform.zip for platform-java builds to allow telephony-common
to build.

Change-Id: I0acbceee976e784573266372071dc1463ea6d53e
 2014-06-18 23:22:20 -07:00
Brian Carlstrom
55fa2ea206 resolved conflicts for merge of 8fd9944e to master 
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
 2014-06-18 19:25:30 -07:00
Colin Cross
9d8854e30c Merge "build: delete 64-bit blacklist" 2014-06-17 21:42:00 +00:00
Colin Cross
ae2986e51a build: delete 64-bit blacklist 
The last projects in the blacklist have been fixed, delete the code.

Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
 2014-06-17 21:35:44 -07:00
Ying Wang
42c9804331 Use the correct MKBOOTIMG. 
Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2
 2014-06-18 11:31:21 -07:00
Brian Carlstrom
338d1e7f33 Help catch common 32/64-bit errors. 
(cherry picked from commit cf5ea762e015bc044d251814d9062ef1df4dd49f)

Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0
 2014-06-17 15:23:49 -07:00
JP Abgrall
55f786e7ad Merge "core+tools: support specifying F2FS as the fstype for userdata" 2014-06-17 20:55:27 +00:00
Xavier Ducrohet
8566651d98 am e87fcf5e: Revert "Add missing support lib to list." 
* commit 'e87fcf5e16f906353f6a62f002a1bd1f8cda5e67':
  Revert "Add missing support lib to list."
 2014-06-18 00:38:06 +00:00
Xavier Ducrohet
e87fcf5e16 Revert "Add missing support lib to list." 
This reverts commit b3ae5354c3.
 2014-06-17 17:25:18 -07:00
Brian Carlstrom
3bd5abb4f9 am a44f9a35: am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit errors." 
* commit 'a44f9a35a284c600616a7f2213a861ecdefd5615':
  Help catch common 32/64-bit errors.
 2014-06-17 23:38:48 +00:00
Deepanshu Gupta
2a7f1c5930 Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev 2014-06-17 20:49:29 +00:00
JP Abgrall
5bfed5a320 core+tools: support specifying F2FS as the fstype for userdata 
- Support TARGET_USERIMAGES_USE_F2FS.
- Support BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE.
- Support "userdata_fs_type" in the prop dict.
- Update build_image to recognize f2fs and call the correct command.

Change-Id: If31cc8bd235f93a4c7814fab36e6e2d13d3037ad
Signed-off-by: JP Abgrall <jpa@google.com>
 2014-06-17 13:32:14 -07:00
Xavier Ducrohet
b8b0302eea am b3ae5354: Add missing support lib to list. 
* commit 'b3ae5354c36a6ab850a1fca34470a93481a5831c':
  Add missing support lib to list.
 2014-06-17 19:26:28 +00:00
Xavier Ducrohet
b3ae5354c3 Add missing support lib to list. 
Change-Id: I6f3f1d1526db9bd76a35a612bc44918deee3e305
 2014-06-17 12:12:50 -07:00
Narayan Kamath
79bc52af37 Fix issue in symlinking 64 bit executables. 
We were not inspecting the value of TARGET_SUPPORTS_{32,64}_BIT_APPS
so we'd sometimes create the wrong symlink if TARGET_IS_64_BIT was
true.

bug: 15661143

Change-Id: I2a6eb3278445fcd14bc9dc9312f41f972ea77971
 2014-06-17 17:02:51 +01:00
Narayan Kamath
b60ccd6672 am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary" 
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
  Make default 64-bit primary, 32-bit secondary
 2014-06-17 10:05:13 +00:00
Ying Wang
f864d502ab Less spammy ProGuard. 
Change-Id: I465921b878c4ed6ec5d564704801e435d1aaa63c
 2014-06-17 11:53:31 -07:00
Narayan Kamath
d73ec26a19 Merge "Make default 64-bit primary, 32-bit secondary" 2014-06-17 04:39:21 +00:00
Brian Carlstrom
d795046319 Make default 64-bit primary, 32-bit secondary 
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
 2014-06-16 23:59:43 -07:00
Doug Zongker
3fd79a352e Merge "full support for OTA of vendor partitions" 2014-06-17 03:47:23 +00:00
Narayan Kamath
9d62dbc532 resolved conflicts for merge of b60ccd66 to master 
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
 2014-06-17 11:11:35 +01:00
Ying Wang
cc033aba81 am fe86a7c1: am a530bd40: Merge "Also include the binaries for the 2nd arch." 
* commit 'fe86a7c1531ac85d634b7fde16ce008ca28118fb':
  Also include the binaries for the 2nd arch.
 2014-06-16 23:53:39 +00:00
Ying Wang
d0052bc70a am e6b3692b: am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file" 
* commit 'e6b3692b8357b52b0a67e12be450e1ccfda5ffb5':
  Explicit record the modules' built-file:installed-file
 2014-06-16 23:53:38 +00:00
Ying Wang
696af13a67 am a307bbc7: am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file." 
* commit 'a307bbc7dcc8ce533743ba829039de1f3f979beb':
  Put modules with install path to system/ to DATA/ in the zip file.
 2014-06-16 23:53:37 +00:00
Ying Wang
c947b4a8ae Also include the binaries for the 2nd arch. 
Also include the binaries for the 2nd arch when building module
packages.

Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
 2014-06-16 16:34:40 -07:00
Doug Zongker
c8b4e849f1 full support for OTA of vendor partitions 
Make vendor partition a first-class member of the OTA system (for
target_files that contain a VENDOR/ subdirectory).

Build vendor images in a way that is compatible with block-based OTA.
Support updating the vendor partition in both full and incremental,
block and file OTAs.  In most cases this is handled by refactoring the
existing code to handle the system partition to handle either, and
then calling it twice.

Currently we don't support incremental OTAs from a target-files
without a VENDOR subdirectory to one with one, or vice versa.  To add
or remove a vendor partition a full OTA will need to be done.

Bug: 15544685
Change-Id: I9cb9a1267060bd9683a9bea19b43a26b5a43800d
 2014-06-16 15:39:54 -07:00
Elliott Hughes
53caaaf6f8 am 0f41ad79: am 1ffda9be: Merge "Remove unused hosts." 
* commit '0f41ad79932bf7e69d3bfab73f8ecf3c28956727':
  Remove unused hosts.
 2014-06-16 22:23:27 +00:00
Ying Wang
c17e0f92c5 Merge "Explicit record the modules' built-file:installed-file" 2014-06-16 22:13:20 +00:00
Ying Wang
74c9850c79 Explicit record the modules' built-file:installed-file 
- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
 2014-06-16 16:41:48 -07:00
Ying Wang
03270b97ca Put modules with install path to system/ to DATA/ in the zip file. 
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
 2014-06-16 16:41:23 -07:00
JP Abgrall
a6e63c2e87 Merge "core: Fixup assert-max-image-size/assert-max-file-size usage" 2014-06-16 21:50:51 +00:00
Ying Wang
d64f3c6ee6 am c947b4a8: Also include the binaries for the 2nd arch. 
* commit 'c947b4a8aec947f4dd6177e3bbd692a144b0a60c':
  Also include the binaries for the 2nd arch.
 2014-06-16 23:42:56 +00:00
Elliott Hughes
7ec725d41f resolved conflicts for merge of 53caaaf6 to master 
Change-Id: I20d265364b09c64d3637e57f500e934ee2310887
 2014-06-16 15:34:25 -07:00
JP Abgrall
0ed7cec97a core: Fixup assert-max-image-size/assert-max-file-size usage 
- Remove the incorrectly used (and unused) 3rd arg to assert-max-image-size
- Remove test for fstype in assert-max-file-size() as it was always
  set to a value leading to 0.

Change-Id: I0a1182fcc85c6c3801d45731e691b9bb38657606
Signed-off-by: JP Abgrall <jpa@google.com>
 2014-06-16 14:20:40 -07:00
Elliott Hughes
bfe62fc30c Remove unused hosts. 
Nobody is using freebsd-x86 or linux-ppc.

Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e
 2014-06-16 14:48:59 -07:00
Ying Wang
4d386c8e04 am 13a476c4: am 2f1f30a9: Merge "Trim down BUILD_FINGERPRINT." 
* commit '13a476c40c0354220829efe29224845da78b6326':
  Trim down BUILD_FINGERPRINT.
 2014-06-16 16:33:45 +00:00
Ying Wang
fcb077ea01 Merge "Put modules with install path to system/ to DATA/ in the zip file." 2014-06-16 15:49:03 +00:00
Ying Wang
a530bd4025 Merge "Also include the binaries for the 2nd arch." 2014-06-16 15:40:29 +00:00
Ying Wang
ec45d37242 Also include the binaries for the 2nd arch. 
Also include the binaries for the 2nd arch when building module
packages.

Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
 2014-06-16 16:42:10 -07:00
Ying Wang
5181a36bce Trim down BUILD_FINGERPRINT. 
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
 2014-06-13 18:02:44 -07:00
Wink Saville
2d5486a006 Merge "Merge kwd to master" 2014-06-13 21:09:46 +00:00
Dan Albert
50031de36e Remove -Bsymbolic from builds. 
This is causing issues when tools like asan try to wrap calls like
malloc. See the referenced bug for more details.

Bug: 15432753
Change-Id: I15e8eab5b773afd02dc14c78500cf8246a617718
 2014-06-13 10:24:12 -07:00
Elliott Hughes
fd40d060d9 am 7f880d15: am 553c289a: am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"." 
* commit '7f880d15da4c73889833087161e4c05b55ef07fe':
  Remove useless stuff from "AndroidConfig.h".
 2014-06-13 00:48:36 +00:00
Elliott Hughes
7f880d15da am 553c289a: am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"." 
* commit '553c289afdbdd774e689898df4e8246fdf68182e':
  Remove useless stuff from "AndroidConfig.h".
 2014-06-12 23:58:12 +00:00
Deepanshu Gupta
354ed641eb Integrate build_font.py [DO NOT MERGE] 
Execute the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Also edited the list of font directories to include in the build.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 887cd0c71e)
 2014-06-12 16:03:17 -07:00
Dianne Hackborn
dd0afa03f2 resolved conflicts for merge of 0c651756 to master 
Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d
 2014-06-12 11:34:48 -07:00
Deepanshu Gupta
04d0f5f3ab am 887cd0c7: Integrate build_font.py again 
* commit '887cd0c71e756d295f6879e6b3f34753b9d67ce8':
  Integrate build_font.py again
 2014-06-12 16:54:20 +00:00
Elliott Hughes
624220c18a Merge "Remove useless stuff from "AndroidConfig.h"." 2014-06-12 03:32:07 +00:00
Elliott Hughes
e82d33d997 Remove useless stuff from "AndroidConfig.h". 
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.

Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
 2014-06-12 15:36:52 -07:00
Wink Saville
273c22cbc0 Merge kwd to master 
Add ims-common support from kwd

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
 2014-06-11 15:21:03 -07:00
Ying Wang
0d26882d85 am 2ebf7c1c: am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants." 
* commit '2ebf7c1c5f3e04f13fa7d80dcc5d060306a8a475':
  Check existence of both 64-bit and 32-bit module variants.
 2014-06-11 21:37:45 +00:00
Dianne Hackborn
0c651756f0 Merge "Update to reflect KKWT's graduation to API 20." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Dianne Hackborn
997b896eeb Update to reflect KKWT's graduation to API 20. 
Change-Id: I4716e71d72b2526fe635079d1b15f623db842c21
 2014-06-11 14:24:32 -07:00
Ying Wang
1ebacee598 am 4706eb3f: am c72592b7: am b2ba5636: Merge "Revert "Don\'t rename host libraries if only one arch is build."" 
* commit '4706eb3f223890d4578a234c8ca786570f00f3a7':
  Revert "Don't rename host libraries if only one arch is build."
 2014-06-11 20:50:05 +00:00
Ying Wang
f2073a55fa am f1b35fb1: am fd76c34a: am c34f37c7: Merge "Allow to opt out both multilib in native test." 
* commit 'f1b35fb159cb823be2172ecdf425e902d6c1bbc3':
  Allow to opt out both multilib in native test.
 2014-06-11 20:49:55 +00:00
Ying Wang
1f5a7c21de am 19aa2837: am 49d9a894: am cec9dc14: Merge "Don\'t rename host libraries if only one arch is build." 
* commit '19aa28379f86b0938b3c6bef41ca6b89b6d91711':
  Don't rename host libraries if only one arch is build.
 2014-06-11 20:49:51 +00:00
Ying Wang
274ad525c1 am 32aff808: am 6bfbfee5: am a45a5d27: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted" 
* commit '32aff8085a2f5fed34a4d28b78bb52a10a5b5751':
  Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
 2014-06-11 20:49:37 +00:00
Ying Wang
01c4f4622b am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion." 
* commit 'dceddd91d9a6516346e752b9f942747bea931cfa':
  Fix loophole in module expansion.
 2014-06-11 20:49:20 +00:00
Ying Wang
70ae5e23fc am 0d276266: am 128cd1b7: am 6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH." 
* commit '0d27626620676dbe72bf5c020008bb2dad20d75f':
  Add global variable HOST_LIBRARY_PATH.
 2014-06-11 20:24:22 +00:00
Ying Wang
f7988507f4 am 2d19cbd2: resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp 
* commit '2d19cbd279ed69c7202f089be174c35c1585f709':
  Switch to 32-bit-by-default host multilib build.
 2014-06-11 19:26:30 +00:00
Ying Wang
80d3bd1582 am b06c655e: am 322362cf: am c0275247: Merge "build native tests for 32-bit and 64-bit" 
* commit 'b06c655e580e683c44354cda8a9fbcd8f30efab6':
  build native tests for 32-bit and 64-bit
 2014-06-11 17:58:43 +00:00
Ying Wang
541b1d0f7c am fe9ad097: am b1f65358: am 5ad17493: Merge "Support .asm being compiled by yasm targeted for x86." 
* commit 'fe9ad0975ade10219a5fa9a77d034ba77735e393':
  Support .asm being compiled by yasm targeted for x86.
 2014-06-11 17:44:54 +00:00
Ying Wang
2ebf7c1c5f am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants." 
* commit '6b468193536c1925944ccbf6269ee057e080aef4':
  Check existence of both 64-bit and 32-bit module variants.
 2014-06-11 02:29:37 +00:00
Deepanshu Gupta
887cd0c71e Integrate build_font.py again 
Executle the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
 2014-06-10 18:41:29 -07:00
Ying Wang
4706eb3f22 am c72592b7: am b2ba5636: Merge "Revert "Don\'t rename host libraries if only one arch is build."" 
* commit 'c72592b7bdcfbedd51198b09917a7c331a552544':
  Revert "Don't rename host libraries if only one arch is build."
 2014-06-11 01:18:28 +00:00
Ying Wang
f1b35fb159 am fd76c34a: am c34f37c7: Merge "Allow to opt out both multilib in native test." 
* commit 'fd76c34a1700d18677a461fb3ae777dd13f813ad':
  Allow to opt out both multilib in native test.
 2014-06-11 01:09:44 +00:00
Ying Wang
19aa28379f am 49d9a894: am cec9dc14: Merge "Don\'t rename host libraries if only one arch is build." 
* commit '49d9a894dcc83ecbc4589d315a9c0799ee6d8846':
  Don't rename host libraries if only one arch is build.
 2014-06-11 00:27:46 +00:00
Ying Wang
32aff8085a am 6bfbfee5: am a45a5d27: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted" 
* commit '6bfbfee5358715933fa90cc3ecd8fcf43338315b':
  Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
 2014-06-10 23:32:41 +00:00
Ying Wang
dceddd91d9 am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion." 
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
  Fix loophole in module expansion.
 2014-06-10 22:29:18 +00:00
Ying Wang
ff3a904522 Check existence of both 64-bit and 32-bit module variants. 
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.

Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
 2014-06-10 19:23:29 -07:00
Ying Wang
7d883401c0 Merge "Added variables to support seperate vendor patition." 2014-06-10 22:18:15 +00:00
Ying Wang
ad10cc76b6 Allow to opt out both multilib in native test. 
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.

Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
 2014-06-10 17:52:20 -07:00
Ying Wang
b1f7fb7a50 Don't rename host libraries if only one arch is build. 
This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.

Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
 2014-06-10 17:18:08 -07:00
Ying Wang
6e85f8b0de Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted 
Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.

Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
 2014-06-10 16:24:31 -07:00
Ying Wang
b2ba5636f1 Merge "Revert "Don't rename host libraries if only one arch is build."" 2014-06-10 22:08:45 +00:00
Ying Wang
532f1127af Revert "Don't rename host libraries if only one arch is build." 
This reverts commit b1f7fb7a50.

Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
 2014-06-11 01:12:18 +00:00
Ying Wang
e1b867dde7 Fix loophole in module expansion. 
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.

With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.

Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
 2014-06-10 14:30:30 -07:00
Ying Wang
0d27626620 am 128cd1b7: am 6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH." 
* commit '128cd1b7eb66ccb05de417a93d6e432447dc875a':
  Add global variable HOST_LIBRARY_PATH.
 2014-06-10 20:35:08 +00:00
Ying Wang
c4595868c4 Add global variable HOST_LIBRARY_PATH. 
With multilib host build, the build system installs host
shared libraries to different directories depending on a
library's bitness:
- HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit;
- 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit;
- If you don't care the bitness of the libraries and just want whatever
  version the librareies are built by default, use HOST_LIBRARY_PATH.

Bug:13751317
Change-Id:Id4c818941dc4ea35d795767c76f698529bd6aebb
 2014-06-10 12:04:56 -07:00
Ying Wang
2d19cbd279 resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp 
Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
 2014-06-10 09:45:45 -07:00
Ying Wang
2713fcebba Switch to 32-bit-by-default host multilib build. 
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.

Bug: 13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
 2014-06-09 17:48:05 -07:00
Vineeta Srivastava
19f6933724 Merge "Add synaptics to vendor owner whitelist" 2014-06-09 23:27:11 +00:00
Ying Wang
b06c655e58 am 322362cf: am c0275247: Merge "build native tests for 32-bit and 64-bit" 
* commit '322362cf01e6d1ed6c73dd27f5a4e162610f55c4':
  build native tests for 32-bit and 64-bit
 2014-06-09 23:00:02 +00:00
Ying Wang
c02752473f Merge "build native tests for 32-bit and 64-bit" 2014-06-09 22:53:00 +00:00
Ying Wang
fe9ad0975a am b1f65358: am 5ad17493: Merge "Support .asm being compiled by yasm targeted for x86." 
* commit 'b1f65358a8af7548dfb02de281b081fc356881b4':
  Support .asm being compiled by yasm targeted for x86.
 2014-06-09 21:51:01 +00:00
Ying Wang
5ad17493cd Merge "Support .asm being compiled by yasm targeted for x86." 2014-06-09 21:43:56 +00:00
Erik Pasternak
30e677081b am e1d76eed: Merge "Revert "Integrate build_font.py"" into lmp-preview-dev 
* commit 'e1d76eed322e620213cd4f936a29229a7658c6a1':
  Revert "Integrate build_font.py"
 2014-06-09 15:55:48 +00:00
Deepanshu Gupta
12d786b56d am 8723f9e2: Merge "Integrate build_font.py" into lmp-preview-dev 
* commit '8723f9e2127204e19b00b0c19d091bee7e3e1b0c':
  Integrate build_font.py
 2014-06-09 15:55:29 +00:00
Erik Pasternak
e1d76eed32 Merge "Revert "Integrate build_font.py"" into lmp-preview-dev 2014-06-08 20:12:41 +00:00
Erik Pasternak
21cf439581 Revert "Integrate build_font.py" 
This CL broke the SDK builds.

This reverts commit 9eebd78f6e.

Change-Id: I973b40688602461bd3b0f8c1e1beb53b9fbec83c
 2014-06-08 19:31:01 +00:00
Deepanshu Gupta
8723f9e212 Merge "Integrate build_font.py" into lmp-preview-dev 2014-06-07 23:33:12 +00:00
Stephen Hines
d17e71f185 am 69d5bd7c: am e266873b: am 1a8f0d3b: Merge "Move comment out of recipe section" 
* commit '69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7':
  Move comment out of recipe section
 2014-06-06 21:33:48 +00:00
Stephen Hines
69d5bd7cbc am e266873b: am 1a8f0d3b: Merge "Move comment out of recipe section" 
* commit 'e266873b211289ce07420ec2c51208ff83c49c36':
  Move comment out of recipe section
 2014-06-06 21:30:57 +00:00
Bart Sears
0e23c5e305 am 3b118a55: MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE 
* commit '3b118a55b94d96f8ac1e1f903d17ed650ccd0355':
  MR2.1 - Version 4.4.4.  Here we go!  DO NOT MERGE
 2014-06-06 21:07:46 +00:00
Bart Sears
3b118a55b9 MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE 
Make is so.

Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0
 2014-06-06 20:41:08 +00:00
Stephen Hines
8ff9252680 Move comment out of recipe section 
If we keep a comment in the recipe, it prints out whenever that component
gets built.

Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
 2014-06-06 12:51:47 -07:00
Ying Wang
dd4db3058a am 56ec31cf: am 3fe9a277: am d0f0918b: Merge "Reenable ccache." 
* commit '56ec31cfca1ed5f9d833d73c327b2799601cd5a4':
  Reenable ccache.
 2014-06-06 18:43:44 +00:00
Ying Wang
56ec31cfca am 3fe9a277: am d0f0918b: Merge "Reenable ccache." 
* commit '3fe9a277fe1f21b947bb7ac5d093d969eb10dc6b':
  Reenable ccache.
 2014-06-06 18:40:14 +00:00
Ying Wang
67ed25f3a6 Reenable ccache. 
The previous commit 994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.

Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
 2014-06-06 11:18:04 -07:00
Ying Wang
7b913ce6fa Support .asm being compiled by yasm targeted for x86. 
Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
 2014-06-06 11:00:36 -07:00
Vineeta Srivastava
5c80218b8e Add synaptics to vendor owner whitelist 
Change-Id: Idef39568cbcc53cb50badcc8d59b7770eef10d5e
 2014-06-05 22:25:56 +00:00
Tim Murray
a526c48982 am 45c39300: am 3c52ff07: am e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 
* commit '45c3930084180857d7b09c0859805506e7ede847':
  Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
 2014-06-04 19:22:56 +00:00
Tim Murray
45c3930084 am 3c52ff07: am e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 
* commit '3c52ff07141c236b51a2ccfe5fdb3de33421bd3b':
  Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
 2014-06-04 19:20:29 +00:00
Tim Murray
e564c0cbd0 Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 2014-06-04 19:00:38 +00:00
Ying Wang
3a9cb0ca11 Merge "Allow to build the update.zip for emulator build." 2014-06-04 17:40:45 +00:00
Ying Wang
e8dc18680f am dc7ff054: am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build. 
* commit 'dc7ff05427e885a59e8884e0f8e10a6c78f2842b':
  Allow to build the update.zip for emulator build.
 2014-06-04 17:30:32 +00:00
Ying Wang
dc7ff05427 am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build. 
* commit 'bc080d510f022da8055b89b85e02d91e74c3757d':
  Allow to build the update.zip for emulator build.
 2014-06-04 17:26:00 +00:00
Ying Wang
bc080d510f am 2a386e0c: Allow to build the update.zip for emulator build. 
* commit '2a386e0cfbdfa009038acede85876a7643f297f5':
  Allow to build the update.zip for emulator build.
 2014-06-04 17:22:21 +00:00
Ying Wang
2a386e0cfb Allow to build the update.zip for emulator build. 
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
 2014-06-04 17:04:14 +00:00
Neil Fuller
3ca25da84e Merge "Add the okhttp tests as a new CTS package" 2014-06-04 10:53:25 +00:00
Andrew Hsieh
51b6c14423 Merge "Add -latomic to all target builds" into lmp-preview-dev 2014-06-04 07:38:25 +00:00
Stephen Hines
5339640da6 Switch name from tblgen -> llvm-tblgen for consistency with upstream tools. 
Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
 2014-06-03 18:28:44 -07:00
Ying Wang
f8824aff68 Allow to build the update.zip for emulator build. 
img_from_target_files.py just skipps the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
 2014-06-03 14:07:27 -07:00
Primiano Tucci
b641702c08 am 1d6506ca: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler." 
* commit '1d6506ca4bb62a8f66cf5f0a72bde096115e757a':
  Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
 2014-06-03 13:13:43 +00:00
Primiano Tucci
454de52c96 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler. 
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

(cherry-picked from AOSP 994c84fb40)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
 2014-06-03 12:24:22 +01:00
Primiano Tucci
1d6506ca4b Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler." 2014-06-03 09:29:51 +00:00
Ying Wang
e3e421f851 Move sdk staging dir to a product-specific dir 
So we can do incremental build across different SDK products.

(cherry picked from commit d7af176199)

Change-Id: I30ebed5328123629519a64c793f94fc8d5aa09a8
 2014-06-02 18:32:54 -07:00
Ying Wang
9c777b3718 am dfafee3b: am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir" 
* commit 'dfafee3b782cc48562126b9c4748cfa2f49f3158':
  Move sdk staging dir to a product-specific dir
 2014-06-03 01:27:55 +00:00
Ying Wang
dfafee3b78 am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir" 
* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
  Move sdk staging dir to a product-specific dir
 2014-06-03 01:25:23 +00:00
Ying Wang
7f349dc968 am 40b7e342: Merge "Move sdk staging dir to a product-specific dir" 
* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
 2014-06-03 01:22:51 +00:00
Ying Wang
d7af176199 Move sdk staging dir to a product-specific dir 
So we can do incremental build across different SDK products.

Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
 2014-06-02 16:16:53 -07:00
Primiano Tucci
994c84fb40 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler. 
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
 2014-06-02 20:12:57 +01:00
Stephen Hines
88bd5edaa4 am 15d49c3b: am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS." 
* commit '15d49c3b30d320422d0209c8726eb0c5cec92d41':
  Add -shared to clang LDFLAGS.
 2014-05-30 23:15:43 +00:00
Stephen Hines
15d49c3b30 am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS." 
* commit '85e0dce5f49bfcad97494a674f8a50219914962a':
  Add -shared to clang LDFLAGS.
 2014-05-30 23:08:50 +00:00
Stephen Hines
85e0dce5f4 am a8b65126: Merge "Add -shared to clang LDFLAGS." 
* commit 'a8b65126cae5335d4c8b31fbf7700907fd2c48dd':
  Add -shared to clang LDFLAGS.
 2014-05-30 23:04:37 +00:00
Nick Kralevich
43c36c8201 am ee7493cc: am 329988c2: am a42e0f50: Merge "arm64: restore relro/now" 
* commit 'ee7493ccb91256e61414e8e0bad8d7173cb5d22e':
  arm64: restore relro/now
 2014-05-30 23:02:54 +00:00
Stephen Hines
a8b65126ca Merge "Add -shared to clang LDFLAGS." 2014-05-30 22:59:48 +00:00
Nick Kralevich
ee7493ccb9 am 329988c2: am a42e0f50: Merge "arm64: restore relro/now" 
* commit '329988c277553621c40bbfff85e9848783992040':
  arm64: restore relro/now
 2014-05-30 22:59:28 +00:00
Nick Kralevich
329988c277 am a42e0f50: Merge "arm64: restore relro/now" 
* commit 'a42e0f50162721bc54c113ef1ed3058cfb38ae67':
  arm64: restore relro/now
 2014-05-30 22:56:11 +00:00
Nick Kralevich
45545761d2 arm64: restore relro/now 
The bug which required this option has been fixed.

Bug: 11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
 2014-05-30 15:46:40 -07:00
Nick Kralevich
bf9f0712f2 am 46c48a0c: am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image." 
* commit '46c48a0c34dfafde4cd55956ffbb9251a1cdac02':
  Use a separate policy for the recovery image.
 2014-05-30 19:01:37 +00:00
Nick Kralevich
46c48a0c34 am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image." 
* commit '1df5b37b5b73324300ae1b5f255c1a772c65328a':
  Use a separate policy for the recovery image.
 2014-05-30 18:27:03 +00:00
Nick Kralevich
1df5b37b5b am 61cf065a: Merge "Use a separate policy for the recovery image." 
* commit '61cf065ae9247a200208dc7df0234e03caff3605':
  Use a separate policy for the recovery image.
 2014-05-30 18:23:41 +00:00
Nick Kralevich
61cf065ae9 Merge "Use a separate policy for the recovery image." 2014-05-30 18:20:48 +00:00
Andrew Hsieh
0c87f3d733 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
 2014-05-30 10:39:24 -07:00
Deepanshu Gupta
9eebd78f6e Integrate build_font.py 
Executle the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Change-Id: I14f8a27b9da8d4aa7b9d2773cf4aa84c6f3c22fe
 2014-05-30 10:29:34 -07:00
Neil Fuller
4fdf6743d9 Add the okhttp tests as a new CTS package 
Bug: 14462336
Change-Id: I74e986b2d6a25a5e4304159d214c16a51a7f7c5f
 2014-05-30 13:56:32 +01:00
Andrew Hsieh
4e5c08d420 am fb0a19d6: am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds" 
* commit 'fb0a19d603b0f2c00ec3491a39d37103496cbca9':
  Add -latomic to all target builds
 2014-05-30 11:50:52 +00:00
Andrew Hsieh
fb0a19d603 am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds" 
* commit 'dc41aa3254cbf443dd08c827e587cf261d1f7b82':
  Add -latomic to all target builds
 2014-05-30 07:56:53 +00:00
Andrew Hsieh
dc41aa3254 am 5c2c70de: Merge "Add -latomic to all target builds" 
* commit '5c2c70de88a6c126460c88cfa64561d7cb2cc030':
  Add -latomic to all target builds
 2014-05-30 07:46:14 +00:00
Andrew Hsieh
5c2c70de88 Merge "Add -latomic to all target builds" 2014-05-30 07:44:02 +00:00
Tim Murray
0f9276d4ba Add -shared to clang LDFLAGS. 
TOT clang doesn't do the right thing with regards to -pie without this.

Change-Id: Ic14cfb25d96359eb18899c09ebaf1d311e937d01
 2014-05-29 17:54:07 -07:00
Daniel Rosenberg
dde3184ae8 Added variables to support seperate vendor patition. 
Change-Id: I73cc76697e138aa8ce1273d410391d55c8d7f34f
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-05-29 15:42:27 -07:00
Brian Carlstrom
c93c03081b 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
 2014-05-29 21:06:19 +00:00
Vineeta Srivastava
3b06789001 Merge "add moto to vendor owner whitelist" 2014-05-29 20:53:43 +00:00
Stephen Smalley
5520f28653 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>
 2014-05-29 16:42:49 -04:00
Brian Carlstrom
ab6f84e3d1 am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so" 
* commit 'e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
  Only enable WITH_DEXPREOPT by default for libdvm.so
 2014-05-29 19:40:02 +00:00
Andrew Hsieh
4c952d72b7 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
 2014-05-29 11:40:46 -07:00
Brian Carlstrom
3f5ff08dc5 Only enable WITH_DEXPREOPT by default for libdvm.so 
Bug: 14298175

(cherry picked from commit 9f8e214a91)

Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
 2014-05-29 09:38:04 -07:00
Brian Carlstrom
e469ea36ff am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so 
* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
  Only enable WITH_DEXPREOPT by default for libdvm.so
 2014-05-29 16:37:20 +00:00
Brian Carlstrom
9f8e214a91 Only enable WITH_DEXPREOPT by default for libdvm.so 
Bug: 14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
 2014-05-28 22:13:07 -07:00
Ying Wang
8b73a86834 am 834ec0ea: am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files." 
* commit '834ec0ead591cf64a5f660af0210e95728e08c4f':
  Add a dummy build recipe for generated RS cpp files.
 2014-05-28 23:45:29 +00:00
Ying Wang
834ec0ead5 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.
 2014-05-28 23:41:42 +00:00
Ying Wang
d3ddfdf847 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.
 2014-05-28 23:38:46 +00:00
Ying Wang
b3bed5952b Merge "Add a dummy build recipe for generated RS cpp files." 2014-05-28 23:33:35 +00:00
Ying Wang
f0c4184852 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
 2014-05-28 23:31:02 +00:00
Ying Wang
d40776aa88 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
 2014-05-28 23:28:58 +00:00
Ying Wang
65afd710a5 Merge "Add a dummy build recipe for the proto generated header files" 2014-05-28 23:26:01 +00:00
Ying Wang
81ab8339fe 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
 2014-05-28 16:17:09 -07:00
Ying Wang
5186dac02b 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
 2014-05-28 16:15:13 -07:00
Brian Carlstrom
9843e86395 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
 2014-05-28 23:13:28 +00:00
Brian Carlstrom
ee26bf6a84 resolved conflicts for merge of 7e127ebe to master 
Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
 2014-05-28 16:02:45 -07:00
Brian Carlstrom
ed97938caa 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
 2014-05-28 22:31:44 +00:00
Ying Wang
1ef0a635f3 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

(cherry picked from commit 994c226b91)

Change-Id: I5469ef1994f2ba91a9c25126349156752fc35b4b
 2014-05-28 15:09:55 -07:00
Brian Carlstrom
31f5db27c6 Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175

(cherry picked from commit 7e127ebe0b)

Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
 2014-05-28 14:49:34 -07:00
Ying Wang
cf68ba00d4 am dcf90646: am 8898f2e2: am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit 'dcf90646b0122b09755014832a67b7c44bc2e1ac':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:36:11 +00:00
Brian Carlstrom
7e127ebe0b Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175
Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
 2014-05-28 14:31:46 -07:00
Ying Wang
dcf90646b0 am 8898f2e2: am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit '8898f2e261d1bb2b389971803a1f4a23639ade9e':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:31:19 +00:00
Ying Wang
8898f2e261 am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit 'f4999d3b8a0d09e790767176c543df1c2ad53c5a':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:28:42 +00:00
Ying Wang
994c226b91 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
 2014-05-28 14:23:26 -07:00
Ying Wang
9df5043594 resolved conflicts for merge of 536d4a76 to master 
Change-Id: Ib655d08e5c9272aef1fd1e130b5fb2b63148a55e
 2014-05-28 11:05:47 -07: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
Vineeta Srivastava
1bd266d006 Merge "Add 'qti' to vendor whitelist" 2014-05-28 15:40:19 +00: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
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
44e1b0bd8a fix build id 
Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
 2014-05-26 22:06:13 -07:00