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
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