p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,968 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

5069 Commits

Author SHA1 Message Date
Ying Wang b574564f2e Reinforce the dependency on package-export.apk. 
This fixes the bug that if an app has no resource at all, we should
still set up the dependency on package-export.apk, because the
AndroidManifest.xml may still reference symbols in package-export.apk.

Change-Id: Idb3f12abf55c04824da5b666fe7c49694e227e2c
 2014-06-19 16:07:30 -07:00
Neil Fuller cc317c40d3 am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone" 
* commit '40f3300577d4b55926728744f1d25c08aa4e4a8b':
  Fix the CTS build now that core is gone
 2014-06-19 10:39:23 +00:00
Bill Yi b76d4093d3 Restore AOSP-style version numbers - DO NOT MERGE 2014-06-19 00:22:38 -07:00
Brian Carlstrom 8fd9944e8f am 32d25fda: am dab766a7: Merge "Switch from core to core-libart" 
* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
  Switch from core to core-libart
 2014-06-19 02:17:54 +00:00
Ying Wang 451dbd7c00 am cc2e90e6: am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH." 
* commit 'cc2e90e653c55724f20410347d709b70b1eaf105':
  Rewrite the clean steps for TARGET_2ND_ARCH.
 2014-06-18 22:58:30 +00:00
Brian Carlstrom dab766a731 Merge "Switch from core to core-libart" 2014-06-18 22:48:04 +00:00
Brian Carlstrom b1dafb1804 Switch from core to core-libart 
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
 2014-06-18 17:42:32 -07:00
Colin Cross a1ac473676 am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist" 
* commit 'b110da5f2bf9cf105dd675648075d13c942d1892':
  build: delete 64-bit blacklist
 2014-06-18 20:24:56 +00:00
Ying Wang 0f1ca830ce Merge "Rewrite the clean steps for TARGET_2ND_ARCH." 2014-06-18 19:25:04 +00:00
Ying Wang f6268b8ed9 Rewrite the clean steps for TARGET_2ND_ARCH. 
Convert clean rules from TARGET_ARCH to TARGET_2ND_ARCH and vice versa.

Change-Id: I5711b38cd834272d26d78e5cf847e97f27139c5b
 2014-06-18 14:17:13 -07:00
Ying Wang 88440c536b am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG." 
* commit '5d88b3d7d615995c6b1909992347fe0b5692492e':
  Use the correct MKBOOTIMG.
 2014-06-18 18:41:01 +00:00
Deepanshu Gupta 849cf47483 am aaa502bc: am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev 
* commit 'aaa502bc9ee796c4121cc275834f083b85b4e71e':
  Integrate build_font.py [DO NOT MERGE]
 2014-06-18 00:25:30 +00:00
Deepanshu Gupta aaa502bc9e am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev 
* commit 'e662adf748be5d8df6056f4cf5da2c821bc27c59':
  Integrate build_font.py [DO NOT MERGE]
 2014-06-18 00:15:39 +00:00
Deepanshu Gupta e662adf748 am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev 
* commit '2a7f1c59300ee462b63e3065f65f24291ca78043':
  Integrate build_font.py [DO NOT MERGE]
 2014-06-18 00:10:39 +00:00
Brian Carlstrom a44f9a35a2 am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit errors." 
* commit 'edbc4595b817aef5f620e78dc283d8cc8fccff2a':
  Help catch common 32/64-bit errors.
 2014-06-17 23:34:52 +00:00
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
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