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

12124 Commits

Author SHA1 Message Date
Torne (Richard Coles) aace2024d7 Support build rules which generate .o files. 
webviewchromium has some build rules which use a custom tool to create
.o files from other input (i.e. they are not prebuilt and so can't be
included in LOCAL_PREBUILT_OBJ_FILES). Support adding .o files to
LOCAL_GENERATED_SOURCES and doing the right thing with them (including
them in the static/dynamic library or executable being built).

Bug: 7714333

Change-Id: I3b1d29eeff30aebeafe33398f9bef2eb6972d997
 2013-03-05 10:35:57 +00:00
Ying Wang eabb34fb90 Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev 2013-03-05 07:09:37 +00:00
Ying Wang e8f5406582 Move emulator.mk out of full_base.mk 
Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.

Change-Id: I475f7262eaa65dd85fc844ed357547c76c82598f
 2013-03-04 23:08:01 -08:00
Ken Sumrall d5198cbcce Merge "Install a unified fstab in the emulator image" into jb-mr2-dev 2013-03-05 03:14:27 +00:00
Ken Sumrall f151d3718b Install a unified fstab in the emulator image 
Also, modify the sdk.mk file to undo an earlier change
to add the unified fstab there, and move the include
of the emulator.mk file to after PRODUCT_COPY_FILES
is initially defined.

Change-Id: I7318ebefa1b3043f32e99a9e278fe4667f760aa8
 2013-03-04 18:30:52 -08:00
The Android Open Source Project 69bb4e42c5 am 564c2b3e: Reconcile with jb-mr1.1-release - do not merge 
* commit '564c2b3e4da71cfe4f1a0c8e15e2c9cec2415eea':
  JDQ39B
 2013-03-05 00:56:08 +00:00
The Android Open Source Project 564c2b3e4d Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Ic2017881546bd6488432b9a87196f1c8eb6e5819
 2013-03-04 11:14:54 -08:00
The Android Automerger 1c2fa25b71 JDQ39B 2013-03-04 11:08:59 -08:00
Ying Wang 0410d3ef3d Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev 2013-03-02 01:43:28 +00:00
Ying Wang 534fcd766e Allow to call dist-for-goals multiple times for the same file 
You can dist the same file for multiple goals in multiple calls to
dist-for-goals. The first call will establish the real copy rule, while
the rest call just establishes the goals' dependency on the dest file.
This enable uss to remove the bizarre $(if ..) enclosing the droid and
sdk dist while avoiding make's multiple rules warning.

Change-Id: I76475db76a9e6167e0e606dd582b54e80dfcdd22
 2013-03-01 16:51:26 -08:00
Dave Langemak d8eb27bf6a Add pseudolanguage codes to l10n builds 
bug: 8299925

Change-Id: Id4bab811bc3f6660f4ce0a21afb689366d80d795
 2013-03-01 14:16:29 -08:00
Kenny Root 3e3a3a2b79 am 14567bb0: am 08d56b4a: Merge "CTS: work around ClassLoader limitation" 
* commit '14567bb00754405fac535bc8be8e46fa8abd7c82':
  CTS: work around ClassLoader limitation
 2013-02-28 17:48:59 +00:00
Kenny Root 14567bb007 am 08d56b4a: Merge "CTS: work around ClassLoader limitation" 
* commit '08d56b4a1049fe4b4d3a01e2087f371fdeefaf84':
  CTS: work around ClassLoader limitation
 2013-02-28 09:47:35 -08:00
Kenny Root 08d56b4a10 Merge "CTS: work around ClassLoader limitation" 2013-02-28 17:23:55 +00:00
Kenny Root 65307c065f CTS: work around ClassLoader limitation 
Trying to use reflection on classes loaded from a different ClassLoader
than the system one caused SecurityException since you can't load
certain packages.

Adding them to the boot classpath forces them to be in the same
ClassLoader.

Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
 2013-02-27 16:56:04 -08:00
Ying Wang 6f05aa44ec Merge "Run e2fsck only when building images with the target files." into jb-mr2-dev 2013-02-28 00:46:07 +00:00
Ken Sumrall e4a045e9e6 Install a unified fstab for the sdk image 
Change-Id: I95ed5ee83783dfce110c1f07b187d4624be9a735
 2013-02-27 16:20:56 -08:00
Ying Wang 45150f8b89 Fix function call syntax error. 
Change-Id: Id40e059ade0c24b62ac407192ed3a67398dfa083
 2013-02-27 15:23:42 -08:00
Ying Wang 4974879c32 Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev 2013-02-27 23:10:12 +00:00
Ying Wang 6a42a25429 Run e2fsck only when building images with the target files. 
With this change, e2fsck is run only when you build the update.zip file,
which is built when "dist" is among the make command.

Bug: 7591683
Change-Id: I446b71d5aa9295aff3af622f115175f769746615
 2013-02-27 13:54:02 -08:00
Ying Wang 087d4ee3ed Switch target java library dependency file from javalib.jar to classes.jar 
Previously, any target Java code that depends on framework.jar has to
wait for the library's javalib.jar.
To build javalib.jar we have to run dx, which is quite slow.
Actually when code links against framework.jar, only classes.jar is
needed.
This improves the potential parallelism of the build system.

Change-Id: I82c5926ef282a3a6096bbf49b54ef4f2a0c2c0e7
 2013-02-27 12:11:37 -08:00
Ian Rogers 25ba3b0975 am e2f7bd46: am c148cca6: Merge "Specify -msse3 on host as on target." 
* commit 'e2f7bd46fc7b9aa746ae46e551727c4db0356d37':
  Specify -msse3 on host as on target.
 2013-02-27 19:03:54 +00:00
Ian Rogers e2f7bd46fc am c148cca6: Merge "Specify -msse3 on host as on target." 
* commit 'c148cca6611c167115458453c250dd9e81b03dda':
  Specify -msse3 on host as on target.
 2013-02-27 11:02:42 -08:00
Stephen Hines ec7d07ebe8 Merge "Reduce RS build verbosity." into jb-mr2-dev 2013-02-27 18:56:24 +00:00
Ian Rogers c148cca661 Merge "Specify -msse3 on host as on target." 2013-02-27 18:15:50 +00:00
Stephen Hines 9ac9b53dc6 Reduce RS build verbosity. 
Change-Id: I9d04198ed1b9025abd60080c5ef23b3ce5ef9e22
 2013-02-27 00:51:08 -08:00
Scott Main d7f8c32ecd am 50882118: am d9876348: am 6fc990df: am c5998412: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load" 
* commit '5088211890511a4dff5d068f8481abc9680a1795':
  Revert "docs: move loading of google ref into doc load event to prevent error during load"
 2013-02-27 02:21:38 +00:00
Scott Main 5088211890 am d9876348: am 6fc990df: am c5998412: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load" 
* commit 'd9876348e1533dbb04779fa4b0b5ccd1b46747fa':
  Revert "docs: move loading of google ref into doc load event to prevent error during load"
 2013-02-26 18:18:34 -08:00
Scott Main d9876348e1 am 6fc990df: am c5998412: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load" 
* commit '6fc990dfe16fb6336457ef0e02a9befd8525082b':
  Revert "docs: move loading of google ref into doc load event to prevent error during load"
 2013-02-26 18:16:09 -08:00
Scott Main 6fc990dfe1 am c5998412: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load" 
* commit 'c5998412fda760deacd5a408759f52820735effe':
  Revert "docs: move loading of google ref into doc load event to prevent error during load"
 2013-02-26 18:14:14 -08:00
Scott Main c5998412fd am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load" 
* commit 'f8333457a5ee9abd3d16c9c0abfe0e19e032801f':
  Revert "docs: move loading of google ref into doc load event to prevent error during load"
 2013-02-26 18:12:22 -08:00
Scott Main f8333457a5 Revert "docs: move loading of google ref into doc load event to prevent error during load" 
This reverts commit 578d6446eb.
 2013-02-26 18:10:20 -08:00
Ian Rogers 35a6b4fb65 Specify -msse3 on host as on target. 
Make the host and the target x86 build more uniform by using the same machine flags.
Its unlikely Android has ever been built on a machine without SSE3 support.

Bug: 8068608
Change-Id: I19635528b61bf2c6faf02c2e575b1d9bf8025d3a
 2013-02-26 15:10:22 -08:00
Scott Main 0d3a1fa14b am 7a689113: am 0670acc9: am 690dc39c: am 79d08b2c: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load 
* commit '7a68911347f18cbbf890bef7f92b28b2872e8e31':
  docs: move loading of google ref into doc load event to prevent error during load
 2013-02-26 22:58:34 +00:00
Scott Main 7a68911347 am 0670acc9: am 690dc39c: am 79d08b2c: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load 
* commit '0670acc9c38b498c2d1f3abb44304d81d42308ca':
  docs: move loading of google ref into doc load event to prevent error during load
 2013-02-26 14:56:00 -08:00
Scott Main 0670acc9c3 am 690dc39c: am 79d08b2c: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load 
* commit '690dc39c46604194a4f189841566e8313125e745':
  docs: move loading of google ref into doc load event to prevent error during load
 2013-02-26 14:54:30 -08:00
Scott Main 690dc39c46 am 79d08b2c: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load 
* commit '79d08b2cc185c0141ee7ec534b219242c827387f':
  docs: move loading of google ref into doc load event to prevent error during load
 2013-02-26 14:53:26 -08:00
Scott Main 79d08b2cc1 am 578d6446: docs: move loading of google ref into doc load event to prevent error during load 
* commit '578d6446eb1714e17a5ccf55a69379f064ec549a':
  docs: move loading of google ref into doc load event to prevent error during load
 2013-02-26 14:51:06 -08:00
Scott Main 578d6446eb docs: move loading of google ref into doc load event to prevent error during load 
Change-Id: Ibe825c25e19f136b2cd58e8a096d13904720e3d2
 2013-02-26 14:46:12 -08:00
Jean-Baptiste Queru e45c235068 am bf13b892: am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge 
* commit 'bf13b8923b7fad0d37b2dcccf2d4dc6b0d4ffff4':
 2013-02-26 22:43:15 +00:00
Jean-Baptiste Queru bf13b8923b am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge 
* commit '8a0dc8e13891678151d8e314a0259666835fed43':
 2013-02-26 14:30:41 -08:00
Jean-Baptiste Queru 8a0dc8e138 am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge 
* commit 'ee98d0ed53aeffac2b1d1be2b24bb78f282af0b2':
  Drop official SDK 17
  JOP40G
 2013-02-26 14:29:17 -08:00
Jean-Baptiste Queru ee98d0ed53 am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge 
* commit '53ed93f3c47c454f14d1218e4b1b2cfab5308e43':
  Drop official SDK 17
  JOP40G
 2013-02-26 14:28:07 -08:00
Jean-Baptiste Queru 53ed93f3c4 Merge from jb-mr1-dev - do not merge 2013-02-26 14:20:43 -08:00
Jean-Baptiste Queru 22c22cf7e0 Reconcile with jb-mr1-release - do not merge 2013-02-26 14:02:57 -08:00
Scott Main e3d336f549 am 02f3e81e: am fb247b7e: am 386cbaeb: am 9f2971d1: docs: fix suggestions due to file name change for js files 
* commit '02f3e81e9ee93848d9805222d79a4a76ea2e898a':
  docs: fix suggestions due to file name change for js files
 2013-02-26 21:18:52 +00:00
Scott Main 02f3e81e9e am fb247b7e: am 386cbaeb: am 9f2971d1: docs: fix suggestions due to file name change for js files 
* commit 'fb247b7e5c1067038518e52aa62a1cbb54ac6fde':
  docs: fix suggestions due to file name change for js files
 2013-02-26 13:16:22 -08:00
Scott Main fb247b7e5c am 386cbaeb: am 9f2971d1: docs: fix suggestions due to file name change for js files 
* commit '386cbaeb90fef0ea90695fac8faa407fbffa356a':
  docs: fix suggestions due to file name change for js files
 2013-02-26 13:13:44 -08:00
Scott Main 386cbaeb90 am 9f2971d1: docs: fix suggestions due to file name change for js files 
* commit '9f2971d1f36e0bffd79033e946ff1378e6ceb309':
  docs: fix suggestions due to file name change for js files
 2013-02-26 13:10:04 -08:00
Scott Main 9f2971d1f3 docs: fix suggestions due to file name change for js files 
Change-Id: I4037c80f79f37f7a80d0977b4e07f992e3de61e1
 2013-02-26 13:07:41 -08:00