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

15689 Commits

Author SHA1 Message Date
Jon Boekenoogen 0f2e5657d4 am 9ccadc82: am a8245d1d: Merge "ggrep" into klp-ub-dev 
* commit '9ccadc8246c6c805265046ce02cb5e42c9cc2ee9':
  ggrep
 2014-04-09 14:03:35 +00:00
Jon Boekenoogen 9ccadc8246 am a8245d1d: Merge "ggrep" into klp-ub-dev 
* commit 'a8245d1dc1746a8cd26aead8c15aa05c9b703455':
  ggrep
 2014-04-09 09:27:33 +00:00
Narayan Kamath 8af7e8ed3e resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp 
Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
 2014-04-09 10:03:41 +01:00
Narayan Kamath 1852237a1b am cf61a7a0: Merge "Add 32 / 64 bit abi lists to system properties." 
* commit 'cf61a7a0db4361689f0ee583fbbe7b3a0519a538':
  Add 32 / 64 bit abi lists to system properties.
 2014-04-09 08:50:28 +00:00
Narayan Kamath cf61a7a0db Merge "Add 32 / 64 bit abi lists to system properties." 2014-04-09 08:48:04 +00:00
Jon Boekenoogen a8245d1dc1 Merge "ggrep" into klp-ub-dev 2014-04-09 04:20:02 +00:00
Narayan Kamath 7303ebda84 Add 32 / 64 bit abi lists to system properties. 
Introduce ro.product.cpu.abilist32 / abilist64, which are
comma separated lists of the 32 and 64 bit ABIs that the
device supports. These properties are used by the zygote and
system server to determine what ABI an app should be
started with.

This changes move abilist related make steps out of envsetup.mk
and into config.mk because they depend on variables set by
core/combo/***. Additionally, config.mk performs a few additional
cleanups of these variables (like stripping them) after the
inclusion of envsetup.mk so this seems like a better place to
put them.

bug: 13647418

Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
 2014-04-08 17:40:40 +01:00
Dirk Dougherty 049808e326 am d031b4de: am 98cc173c: am 46b443ac: Adjust opacity for non-hover states and a few others. 
* commit 'd031b4de79308fa347ae6b38f552e535a9ecef64':
  Adjust opacity for non-hover states and a few others.
 2014-04-08 01:13:15 +00:00
Dirk Dougherty d031b4de79 am 98cc173c: am 46b443ac: Adjust opacity for non-hover states and a few others. 
* commit '98cc173c165fa2141426464a4205441617ba3bd2':
  Adjust opacity for non-hover states and a few others.
 2014-04-08 01:08:06 +00:00
Dirk Dougherty 98cc173c16 am 46b443ac: Adjust opacity for non-hover states and a few others. 
* commit '46b443acbdd80cf41352b68f4f482de4cf729cba':
  Adjust opacity for non-hover states and a few others.
 2014-04-08 01:01:29 +00:00
Ying Wang c9c3ed2299 am 5d33de08: am bdac8cf1: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"" 
* commit '5d33de08196b5c77a58a3e3a045a1b3bf31e09a7':
  Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
 2014-04-07 22:48:38 +00:00
Ying Wang 25c0096bd3 am b55bb77e: am 1b08226a: Merge "Different bootclasspath for droiddoc." 
* commit 'b55bb77ef260f97337be7f15dc9c1433f2ddce98':
  Different bootclasspath for droiddoc.
 2014-04-07 22:48:37 +00:00
Ying Wang 5d33de0819 am bdac8cf1: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"" 
* commit 'bdac8cf148bab0e0ff9d8d51ab202ccb3adfcae8':
  Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
 2014-04-07 22:42:57 +00:00
Ying Wang b55bb77ef2 am 1b08226a: Merge "Different bootclasspath for droiddoc." 
* commit '1b08226afa693646facbd718be2b4a657c837dc2':
  Different bootclasspath for droiddoc.
 2014-04-07 22:42:57 +00:00
Ying Wang bdac8cf148 Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"" 2014-04-07 22:41:22 +00:00
Ying Wang 1b08226afa Merge "Different bootclasspath for droiddoc." 2014-04-07 22:39:06 +00:00
Ying Wang be835b6f3e am 90219d98: am cb733bc5: Merge "Fix droiddoc generation." 
* commit '90219d985fd784be5bcee8ce7b62aa41f41d0dd7':
  Fix droiddoc generation.
 2014-04-07 22:36:43 +00:00
Ying Wang 90219d985f am cb733bc5: Merge "Fix droiddoc generation." 
* commit 'cb733bc564d974cfd3fe08be1d0e5c06cd85911f':
  Fix droiddoc generation.
 2014-04-07 22:31:18 +00:00
Ying Wang cb733bc564 Merge "Fix droiddoc generation." 2014-04-07 22:26:10 +00:00
Ying Wang 5b6b46459c Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found" 
It seems to be a javac/javadoc bug.
See https://code.google.com/p/doclava/issues/detail?id=38

sun.util.resources.OpenListResourceBundle is a class defined in the host rt.jar,
but sometimes on some platform javadoc/javac can't find it.
-XDignore.symbol.file tells javadoc/javac to skip the stubs file ct.sym
and link against rt.jar directly.

Change-Id: I3930f7399fc14b2d6b43c29f737fa90f37515aff
 2014-04-07 15:19:33 -07:00
Ying Wang 584d8adbea Different bootclasspath for droiddoc. 
- If it's host module, don't set bootclasspath;
- If it's arget module,
  - It can build against the API stubs;
  - It can build against a historical SDK version;
  - It can build against core.jar

Change-Id: Id1ec3ba624bc38068b206ad7173f4facf590e021
 2014-04-07 15:14:50 -07:00
Narayan Kamath f122d41b75 Fix droiddoc generation. 
We want javadoc generated from the standard libraries
we supply and not the host standard libraries.

This also has the side effect of fixing javadoc generation
for java7 APIs that android introduced, while compiling
with java6.

bug: 8992787
Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d
 2014-04-07 15:08:18 -07:00
Jon Boekenoogen cbca56fb72 ggrep 
Add ggrep to search Gradle files more easily. Similar
to jgrep, cgrep, mgrep, etc...

Change-Id: I9f0bc74560c1df4c369216eabdb9e825bcb6fe75
 2014-04-07 21:05:38 +00:00
Scott Kennedy ee16b2c23c am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields 
* commit '2452774c0be2d6ebf2d433045d172787c90772ca':
  Keep Parcelable CREATOR fields
 2014-04-07 19:09:11 +00:00
Scott Kennedy 2452774c0b am 62eb51af: Keep Parcelable CREATOR fields 
* commit '62eb51af23b5f0ac43a8f596582d469fe5e3a375':
  Keep Parcelable CREATOR fields
 2014-04-07 19:02:54 +00:00
Dirk Dougherty 46b443acbd Adjust opacity for non-hover states and a few others. 
Change-Id: I8a6dee3e25bc8e6c3f1ca19d4e68037df5ce9b91
 2014-04-07 11:55:27 -07:00
Scott Kennedy 62eb51af23 Keep Parcelable CREATOR fields 
Change-Id: I64451134a9d11d17307ef4d8ea923df5fe5e37ed
 2014-04-07 11:50:23 -07:00
Ying Wang 821b37d817 am 0df45b08: am 260942fa: Merge "Build with java7 by default." 
* commit '0df45b0898710a2e7ddd723fae450ad701a4614d':
  Build with java7 by default.
 2014-04-05 01:53:59 +00:00
Ying Wang 0df45b0898 am 260942fa: Merge "Build with java7 by default." 
* commit '260942fa826052f24455dbaf74e54189efb44e8b':
  Build with java7 by default.
 2014-04-05 01:50:50 +00:00
Ying Wang 260942fa82 Merge "Build with java7 by default." 2014-04-05 01:46:21 +00:00
Narayan Kamath c84889b80a Build with java7 by default. 
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
  the more general version check.
- Update the link in the version check error message to the
  "initializing" page instead of the "download" page. The latter
  talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d

Conflicts:
	core/main.mk
 2014-04-04 18:44:47 -07:00
Ying Wang f90ef06f08 am 73c1422d: am b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set." 
* commit '73c1422dd297553948ebfc4603fe852aa9a0336a':
  Disable host -fPIE if BUILD_HOST_static is set.
 2014-04-04 23:19:20 +00:00
Ying Wang 73c1422dd2 am b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set." 
* commit 'b5956468e4cbfbd3a97fa6775b81406c4c949e22':
  Disable host -fPIE if BUILD_HOST_static is set.
 2014-04-04 23:16:06 +00:00
Ying Wang b5956468e4 Merge "Disable host -fPIE if BUILD_HOST_static is set." 2014-04-04 23:10:28 +00:00
Ying Wang faf3d5ed0f Disable host -fPIE if BUILD_HOST_static is set. 
It turns out -static doesn't work with -fPIE.

Bug: 13568878
Change-Id: I66951a5517dece1c5f4f22c329cf703bd99b5163
 2014-04-04 14:38:14 -07:00
Steve Moyer 2482da64f8 am 90b089de: (-s ours) am b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" 
* commit '90b089de4c1e9ffe3bc13c7aa615c75579214abd':
  DO NOT MERGE: Combine emulator test projects into a single apk
 2014-04-04 16:42:57 +00:00
Steve Moyer 90b089de4c am b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" 
* commit 'b9d6f6f15c7ea54a55f892654a450fff609b1f5f':
  DO NOT MERGE: Combine emulator test projects into a single apk
 2014-04-04 16:36:18 +00:00
Steve Moyer b9d6f6f15c Merge "DO NOT MERGE: Combine emulator test projects into a single apk" 2014-04-04 16:32:06 +00:00
Steve Moyer 0ced06ea0f DO NOT MERGE: Combine emulator test projects into a single apk 
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
 2014-04-03 16:01:06 -07:00
Ying Wang 88e1a1103a am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"." 
* commit '680e037007fd0f4207a4734b8fccce17a91ee682':
  Unset _JAVA_OPTIONS before running "java -version".
 2014-04-03 01:57:25 +00:00
Ying Wang 680e037007 am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"." 
* commit '59ff600927033db50ab4ef131ef198c686a5a65b':
  Unset _JAVA_OPTIONS before running "java -version".
 2014-04-03 01:51:19 +00:00
Ying Wang 59ff600927 Merge "Unset _JAVA_OPTIONS before running "java -version"." 2014-04-03 01:47:18 +00:00
Ying Wang 8a52b231d2 Unset _JAVA_OPTIONS before running "java -version". 
Unfortunately the previous approach of grepping out java version before
"head -n 1" clash with the effort of running "java -version" only once.

Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
 2014-04-02 18:15:10 -07:00
Dirk Dougherty 5fe1b387aa am 812d3d47: am 08032409: Add basic support for rendering dynamic content on pages. 
* commit '812d3d478be650f5b5bb1dfe00d6131986c26886':
  Add basic support for rendering dynamic content on pages.
 2014-04-02 23:35:43 +00:00
Dirk Dougherty 812d3d478b am 08032409: Add basic support for rendering dynamic content on pages. 
* commit '08032409b4dd29740e1c8e703eada0d1ce86e58c':
  Add basic support for rendering dynamic content on pages.
 2014-04-02 23:32:20 +00:00
Greg Hackmann 0fd37501c4 am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" 
* commit 'f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd':
  Revert "HACK: disable emulator on x86_64"
 2014-04-02 23:04:57 +00:00
Greg Hackmann f518e8380c am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" 
* commit 'f17508760898e0debeb4ae7ff6455d664577c647':
  Revert "HACK: disable emulator on x86_64"
 2014-04-02 22:58:07 +00:00
Greg Hackmann f175087608 Merge "Revert "HACK: disable emulator on x86_64"" 2014-04-02 22:53:45 +00:00
Dirk Dougherty 08032409b4 Add basic support for rendering dynamic content on pages. 
Change-Id: If3ba4f71771a01043ec6d544e3b4a9222ba35daf
 2014-04-02 12:48:41 -07:00
Colin Cross 0396b10235 am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size" 
* commit '578f7ec487c2c00581cdc9807d0d24883ba4406a':
  aosp_arm64: increase userdata image size
 2014-04-02 17:39:56 +00:00