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 e050245b7a am 0d0b7b36: am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build." 
* commit '0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
  More consistent host library path in multilib build.
 2014-07-01 00:35:21 +00:00
Ying Wang 0d0b7b3669 am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build." 
* commit '2530c787db272bfb4afab80e37323b9b7d00671c':
  More consistent host library path in multilib build.
 2014-07-01 00:28:14 +00:00
Ying Wang 2530c787db am 4b539d15: Merge "More consistent host library path in multilib build." 
* commit '4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
  More consistent host library path in multilib build.
 2014-07-01 00:22:30 +00:00
Elliott Hughes 0635498086 am 3a2f6ecf: am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64." 
* commit '3a2f6ecf3f7af6819b601645334d4c563401d37a':
  Add -Wl,--fatal-warnings to x86_64.
 2014-06-30 23:04:35 +00:00
Elliott Hughes 3a2f6ecf3f am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64." 
* commit '491871aa03b6a6b4d4f1d6ebb7e2f4dc746b4d4b':
  Add -Wl,--fatal-warnings to x86_64.
 2014-06-30 22:59:37 +00:00
Elliott Hughes 491871aa03 am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64." 
* commit '4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
  Add -Wl,--fatal-warnings to x86_64.
 2014-06-30 22:53:49 +00:00
Ying Wang 4b539d1533 Merge "More consistent host library path in multilib build." 2014-06-30 22:29:38 +00:00
Ying Wang 36ef50f2a2 More consistent host library path in multilib build. 
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.

Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
 2014-06-30 17:06:21 -07:00
Ying Wang 9327f77a01 am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs." 
* commit 'ccbf59304645dde557e24e7a8dd1440111d1a3ce':
  Fix missing rs_compatibility_jni_libs.
 2014-06-30 18:30:46 +00:00
Ying Wang ccbf593046 am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs." 
* commit '51254e6c6065c0c771886472853e6dbc5377c6ae':
  Fix missing rs_compatibility_jni_libs.
 2014-06-30 18:25:37 +00:00
Ying Wang a626d3b44b Fix missing rs_compatibility_jni_libs. 
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
 2014-06-30 11:17:16 -07:00
Brian Carlstrom 191e5988d0 resolved conflicts for merge of da92aef7 to master 
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
 2014-06-28 13:54:24 -07:00
Ian Rogers da92aef762 am 8625b6e7: am 7634e413: Merge "Host support for prefer symlink" 
* commit '8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
  Host support for prefer symlink
 2014-06-28 00:36:10 +00:00
Ian Rogers 8625b6e74a am 7634e413: Merge "Host support for prefer symlink" 
* commit '7634e4136fee6c7a02f4a343072400ba575c0051':
  Host support for prefer symlink
 2014-06-28 00:30:43 +00:00
Ying Wang efe7779cfb Fix missing rs_compatibility_jni_libs. 
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
 2014-06-30 11:20:41 -07:00
Ian Rogers cf331d931d Host support for prefer symlink 
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.

Change-Id: I6045de20c948b456a150033deb3459895aff83c6
 2014-06-27 17:23:03 -07:00
Ying Wang 7a6a9a5582 am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds." 
* commit '4bdbd6d4346a246df8edaf9323e15d84a1f35951':
  Add --pseudo-localize aapt parameter for builds.
 2014-06-27 16:19:26 +00:00
Ying Wang 4bdbd6d434 am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds." 
* commit 'e1b43254b72613e6bf9ac994c1b3f07e0020ed9c':
  Add --pseudo-localize aapt parameter for builds.
 2014-06-27 16:14:30 +00:00
Ying Wang 8d43e17bfd Merge "Support to check System API." 2014-06-27 15:56:14 +00:00
Ying Wang 829f68bb02 Support to check System API. 
Change-Id: I60f8c9bb13efb6a440bb735d634f63fab035c810
 2014-06-26 17:54:28 -07:00
Colin Cross e2543ea2ea Merge "build: fix vendor symbols in gdb" 2014-06-26 18:42:03 +00:00
Colin Cross d00c0a2e20 HACK: report CPU abi as 2nd arch if present 
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.

Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
 2014-06-27 10:49:26 -07:00
Colin Cross a58f8e04c9 build: fix vendor symbols in gdb 
Set TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED
Append '64' for 64-bit libraries

Change-Id: Ief289bb23950d4bed84cf616cff6038fbd8caf95
 2014-06-27 10:48:22 -07:00
Ying Wang a26a2123b8 am 7a6a9a55: am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds." 
* commit '7a6a9a558271ac959a2e441fe27aae3df77d4421':
  Add --pseudo-localize aapt parameter for builds.
 2014-06-27 16:24:46 +00:00
Elliott Hughes 4b7ba41704 Merge "Add -Wl,--fatal-warnings to x86_64." 2014-06-26 18:33:52 +00:00
Elliott Hughes 3beb51692e Add -Wl,--fatal-warnings to x86_64. 
Bug: 11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
 2014-06-30 14:52:30 -07:00
Igor Viarheichyk c4dfe6ef30 Add --pseudo-localize aapt parameter for builds. 
Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.

Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
 2014-06-26 17:27:36 -07:00
Ying Wang f15250ed86 Set up oem.img directory structure for TARGET_2ND_ARCH. 
Change-Id: Ia931a10708225c428b658cb4a30e8bba66fa7308
 2014-06-26 14:12:35 -07:00
Ying Wang 0e2b634408 am 01b179bf: am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build" 
* commit '01b179bf3b5c4c0307e0efb4004a1c44705fe780':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
 2014-06-25 23:21:30 +00:00
Ying Wang 01b179bf3b am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build" 
* commit 'bb964f00403a23d2f1ec3313f7b579a9e7f0f12a':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
 2014-06-25 23:03:02 +00:00
Ying Wang bb964f0040 am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build" 
* commit '432cd6dd78afe9c23cd0ddf669e4f0f973a17a7c':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
 2014-06-25 22:58:11 +00:00
Ying Wang 904446ce0b am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build." 
* commit '1a3d260f68755b476aa867477fc75d47ef5317bf':
  Support to add JNI of both archs in multilib build.
 2014-06-25 18:46:34 +00:00
Ying Wang 1a3d260f68 am e69d4350: Merge "Support to add JNI of both archs in multilib build." 
* commit 'e69d4350cd4af04349b703ba169ba516a96913ba':
  Support to add JNI of both archs in multilib build.
 2014-06-25 18:37:53 +00:00
Ying Wang 6129192ed6 Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build 
Bug: 15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
 2014-06-25 14:25:14 -07:00
Ying Wang 58f8cf7273 am 904446ce: am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build." 
* commit '904446ce0b3f430ac88ae0c08b9c613721474cd5':
  Support to add JNI of both archs in multilib build.
 2014-06-25 18:52:02 +00:00
Ying Wang 8e20ef6205 Support to add JNI of both archs in multilib build. 
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.

Bug: 15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
 2014-06-25 09:07:01 -07:00
smain@google.com 263d6660c8 am 04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev 
* commit '04edc344a1887465692b49e3eb58e03dccedd675':
  DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
 2014-06-25 00:42:51 +00:00
bryant_liu 5f98ff80d4 build: core: Add nxpsw for AEC function 
Change-Id: I27d9bf891e5c67aef843489c2136a586ad921cb2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2014-06-24 13:11:49 -07:00
Ying Wang 1a9e1b43e9 am daaec135: am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists." 
* commit 'daaec135b4d141335fc1f4e3edf9eb526c9f6954':
  Resolve :32 to 32-bit variant only if the variant exists.
 2014-06-24 19:42:46 +00:00
Ying Wang daaec135b4 am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists." 
* commit '5899ad254d3b94653b88e5f0f41f54690f22bd24':
  Resolve :32 to 32-bit variant only if the variant exists.
 2014-06-24 19:35:31 +00:00
Ying Wang 5899ad254d am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists." 
* commit 'b00bb2d865c21a446d94422346e1bb0fdbc9ba29':
  Resolve :32 to 32-bit variant only if the variant exists.
 2014-06-24 18:17:52 +00:00
Ying Wang 111ccebf30 am 995783d4: am 57befc90: am eb12847b: Merge "Switch another reference from core to core-libart" 
* commit '995783d4fde29634e9c61379db5fedad0a232089':
  Switch another reference from core to core-libart
 2014-06-24 10:38:49 +00:00
Ying Wang 995783d4fd am 57befc90: am eb12847b: Merge "Switch another reference from core to core-libart" 
* commit '57befc90e924704a7c03bde9596483d0cf1bf36b':
  Switch another reference from core to core-libart
 2014-06-24 09:28:31 +00:00
Ying Wang 57befc90e9 am eb12847b: Merge "Switch another reference from core to core-libart" 
* commit 'eb12847b332831e31a3cf7e2f89bd10fd626d7d5':
  Switch another reference from core to core-libart
 2014-06-24 06:53:20 +00:00
Brian Carlstrom 074151bdf3 Switch another reference from core to core-libart 
Bug: 14298175
Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d
 2014-06-23 15:34:17 -07:00
Ying Wang 7e73eb3f7c Resolve :32 to 32-bit variant only if the variant exists. 
Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.

Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
 2014-06-24 10:22:17 -07:00
smain@google.com 6f97b12c78 DO NOT MERGE 
remove leanback and recyclerview from javadoc build for d.android.com

Change-Id: I0faa1db29dcadda9bfa96bcf4096e369f0a7a4e0
 2014-06-24 17:36:31 -07:00
Bill Yi 85fe14395b Merge "Restore AOSP-style version numbers - DO NOT MERGE" 2014-06-20 02:09:57 +00:00
Ying Wang eb76adb55f Move sdk staging dir to a product-specific dir. DO NOT MERGE. 
So we can do incremental build across different SDK products.

(cherry picked from commit d7af176199)

Change-Id: I7fc1489c00511b6689d738ee12f0347618c03aa3
 2014-06-20 08:59:33 -07:00
Tsu Chiang Chuang bcf11b0b0f add jdwp tests to CTS. 
Bug: 8538755

Change-Id: Ie55c0f35ff956726a4f08734c2ad4dc03862dac7
 2014-06-20 12:41:48 -07:00