Commit Graph

2942 Commits

Author SHA1 Message Date
Ying Wang c06243d195 Fix jar dependency on the local manifest file.
Change-Id: I1a868885e72c94c4b065723a8d6e890fce5ba1e0
http://b/issue?id=1444634
2010-07-20 16:36:44 -07:00
Ying Wang ec5e729fcf Make build/core/find-jdk-tools-jar.sh fail more explicitly
http://b/issue?id=1505957
Before this change, if tools.jar can not be found, make reports error like:
make: *** No rule to make target `Please-install-JDK-5.0,-update-12-or-higher,-which-you-can-download-from-java.sun.com'...
With this change, the error message is much nicer:
build/core/config.mk:264: *** Error: could not find jdk tools.jar, please install JDK-5.0, update 12 or higher, which you can download from java.sun.com.  Stop.

Change-Id: Id33cfb6ee7676d66f00d0a41d07c1f27abc6a402
2010-07-20 16:30:40 -07:00
Ying Wang 0bd59a0a58 Build system support for RenderScript
With this change, you can add your .rs files to LOCAL_SRC_FILES.
The .rs files will be compiled by slang and the output .java files
will be compiled into the jar, while the generated .bc files will
be put into the final apk as raw resources.

Change-Id: Icde3d6139951d6d039b4b37376e72e1fc5c8b0d4
2010-07-19 13:38:56 -07:00
The Android Open Source Project 79960bbaf0 am fa2d8ace: merge from open-source master
Merge commit 'fa2d8ace56b8f7b150da3b86d00263a9266e9208'

* commit 'fa2d8ace56b8f7b150da3b86d00263a9266e9208':
  Add full_x86 product.
2010-07-16 13:06:24 -07:00
The Android Open Source Project fa2d8ace56 merge from open-source master
Change-Id: Ib0c0f02bb8fc87c3221fd9d2387a46b579a8ce40
2010-07-16 13:03:44 -07:00
Andy McFadden c5a3f42a18 Merge "Update runhat command to use "am dumpheap"." 2010-07-16 07:40:37 -07:00
Joe Onorato 9582d2c572 am c8ae417b: am b1c272a6: Do a full clean build because of the installclean improvement steps
Merge commit 'c8ae417bdce7e49e08de7046beccf8a31276d715'

* commit 'c8ae417bdce7e49e08de7046beccf8a31276d715':
  Do a full clean build because of the installclean improvement steps
2010-07-15 23:24:09 -07:00
Scott Main bee4915392 am 21bd43a3: am 81f42236: am 9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '21bd43a3d9600f25a1d52bde639e0d701cfa86f2'

* commit '21bd43a3d9600f25a1d52bde639e0d701cfa86f2':
  docs: ensure code-ified links in qv are the proper color
2010-07-15 23:21:04 -07:00
Joe Onorato c8ae417bdc am b1c272a6: Do a full clean build because of the installclean improvement steps
Merge commit 'b1c272a670936322db5200d888ea8558eb266d6e' into gingerbread-plus-aosp

* commit 'b1c272a670936322db5200d888ea8558eb266d6e':
  Do a full clean build because of the installclean improvement steps
2010-07-15 17:05:21 -07:00
Joe Onorato b1c272a670 Do a full clean build because of the installclean improvement steps
Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f
2010-07-15 17:02:25 -07:00
Scott Main 21bd43a3d9 am 81f42236: am 9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '81f42236e2971caac9354686d7acbe40f3fe0f4e' into gingerbread-plus-aosp

* commit '81f42236e2971caac9354686d7acbe40f3fe0f4e':
  docs: ensure code-ified links in qv are the proper color
2010-07-15 16:46:26 -07:00
Scott Main 81f42236e2 am 9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread

* commit '9269a711753f2523acd3fe5ae661559f754a1bd0':
  docs: ensure code-ified links in qv are the proper color
2010-07-15 16:43:38 -07:00
Jean-Baptiste Queru 6c2df3e98b Add full_x86 product.
By inheriting from full, this will be more self-maintaining, and
automatically gets a better-configured variant (e.g. it has locales,
a date format, etc...).

Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
2010-07-15 14:04:39 -07:00
Scott Main 9269a71175 docs: ensure code-ified links in qv are the proper color
Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7
2010-07-15 11:21:56 -07:00
Joe Onorato f0be6c08b3 am 90ef224f: am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
Merge commit '90ef224f8ff2b0cec58f49306d333b7489ec37e8'

* commit '90ef224f8ff2b0cec58f49306d333b7489ec37e8':
  Instrumentation links against the jar file for its app, so use that at the dependency.
2010-07-15 11:14:25 -07:00
Joe Onorato c236f78c98 am 84843e68: am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread
Merge commit '84843e6843f0429f0729deb5670c22da0dcc5507'

* commit '84843e6843f0429f0729deb5670c22da0dcc5507':
  Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
2010-07-15 11:14:22 -07:00
Joe Onorato 7e01d1469b am a3b31fba: am 2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit 'a3b31fba91da41ad12d4ed3272942b4208979d7d'

* commit 'a3b31fba91da41ad12d4ed3272942b4208979d7d':
  The ICU data is no longer compiled directly into the shared library.
2010-07-15 11:14:19 -07:00
Joe Onorato 90ef224f8f am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
Merge commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec' into gingerbread-plus-aosp

* commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec':
  Instrumentation links against the jar file for its app, so use that at the dependency.
2010-07-15 11:10:32 -07:00
Joe Onorato 84843e6843 am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread
Merge commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp

* commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5':
  Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
2010-07-15 11:10:29 -07:00
Joe Onorato a3b31fba91 am 2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '2198ff81b98941e905f7e39616f5ca15effb5704' into gingerbread-plus-aosp

* commit '2198ff81b98941e905f7e39616f5ca15effb5704':
  The ICU data is no longer compiled directly into the shared library.
2010-07-15 11:10:26 -07:00
Joe Onorato e2c6225241 Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread 2010-07-15 11:07:42 -07:00
Joe Onorato d7324cc356 Merge "Fix event-log-tags so we don't rebuild framework.jar because of an installclean." into gingerbread 2010-07-15 11:07:35 -07:00
Joe Onorato 2198ff81b9 Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 2010-07-15 11:07:30 -07:00
Joe Onorato 14d9515363 Instrumentation links against the jar file for its app, so use that at the dependency.
I don't remember exactly, but I think the dependencies for apps
were broken, and you couldn't reliably cause the java to be rebuilt
by depending just on the jar file-- you needed to depend on the
apk.  That isn't the case anymore, and relying on the apk means
that something built in out/target/common was depending on something
that's deleted by installclean.

With this change (and others), on my mac, the build after
installclean for passion-eng takes 2 minutes instead of 11.

Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc
2010-07-14 19:49:05 -07:00
Mathias Agopian 0b18194643 am e80545f0: am 9967e9db: Merge "add an entry for the new libgui" into gingerbread
Merge commit 'e80545f00d819f0ef300e3146b404d382288fb4e'

* commit 'e80545f00d819f0ef300e3146b404d382288fb4e':
  add an entry for the new libgui
2010-07-14 16:39:35 -07:00
Mathias Agopian e80545f00d am 9967e9db: Merge "add an entry for the new libgui" into gingerbread
Merge commit '9967e9dbb82e982db67fcfc5412055f26b8721b4' into gingerbread-plus-aosp

* commit '9967e9dbb82e982db67fcfc5412055f26b8721b4':
  add an entry for the new libgui
2010-07-14 16:36:14 -07:00
Mathias Agopian 9967e9dbb8 Merge "add an entry for the new libgui" into gingerbread 2010-07-14 16:31:43 -07:00
Andy McFadden b628985c9b Update runhat command to use "am dumpheap".
Instead of sending a kill -10 to write a file to /data/misc, we now use
"am dumpheap" to create a file on /sdcard.

Also,
- Removed mention of unused "output-file" argument.
- Quoted args in initial tests so bash doesn't go nuts when you say
  "runhat" with no arguments.

Bug 2835170.

Change-Id: I614fdb54a1d6b8824bc9b568c07cc0901c41a3d4
2010-07-14 12:43:11 -07:00
Jean-Baptiste Queru c3a0e4c42d am c70574ad: am 07523a19: am a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit 'c70574add569a80872b8b00c0a9627b3e94c04f5'

* commit 'c70574add569a80872b8b00c0a9627b3e94c04f5':
  Build Accessibility Tests and APK
2010-07-14 11:34:21 -07:00
Jean-Baptiste Queru c70574add5 am 07523a19: am a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit '07523a191de568aba9753d4d12d1fe392feea497' into gingerbread-plus-aosp

* commit '07523a191de568aba9753d4d12d1fe392feea497':
  Build Accessibility Tests and APK
2010-07-14 11:32:07 -07:00
Jean-Baptiste Queru 07523a191d am a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a' into gingerbread

* commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a':
  Build Accessibility Tests and APK
2010-07-14 11:29:08 -07:00
Jean-Baptiste Queru a0cb466645 Merge "merge from open-source froyo" into froyo 2010-07-14 11:06:23 -07:00
Joe Onorato b751053151 Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers.  Then produce a file that's filtered
for what's going to be installed.

Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
2010-07-14 10:22:54 -07:00
Mathias Agopian b46f2c747c add an entry for the new libgui
libgui is for high level C++ frameworks, it can depend on the
binder (unlike libui).

Change-Id: I4a1ebc69284919c85dce03e1395578af2fd08aa8
2010-07-13 22:27:47 -07:00
Ying Wang ad8aec94fa resolved conflicts for merge of 6c56dd64 to master
Change-Id: If806a737c5cc46cd4545788dfa991cdeab488213
2010-07-13 21:08:38 -07:00
Joe Onorato 53b3cadbba The ICU data is no longer compiled directly into the shared library.
Change-Id: I79accedc16d6e62a95c0ec6f08ad2538013cd0b3
2010-07-13 19:05:37 -07:00
Ying Wang 6c56dd64b2 am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread
Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp

* commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
  Add phony target dist_libraries
2010-07-13 19:02:25 -07:00
Ying Wang a9b02f0bfe resolved conflicts for merge of a6bed2f7 to gingerbread
Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
2010-07-13 18:59:56 -07:00
Ying Wang a6bed2f723 Merge "Add phony target dist_libraries" into froyo 2010-07-13 18:50:05 -07:00
Ying Wang 95318832be am 4a1addef: am 90b1d3dc: am b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Merge commit '4a1addef83d6458ba41b498648a36046a27a01b8'

* commit '4a1addef83d6458ba41b498648a36046a27a01b8':
  Keep the crt start/end var name of sh consistent with other archs
2010-07-13 17:51:15 -07:00
Ying Wang 4a1addef83 am 90b1d3dc: am b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Merge commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09' into gingerbread-plus-aosp

* commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09':
  Keep the crt start/end var name of sh consistent with other archs
2010-07-13 17:48:40 -07:00
Ying Wang 90b1d3dcfe am b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Merge commit 'b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread

* commit 'b6a1c1802961f40fe4736e80402f849968cd2563':
  Keep the crt start/end var name of sh consistent with other archs
2010-07-13 17:46:29 -07:00
Ying Wang b6a1c18029 Keep the crt start/end var name of sh consistent with other archs
So that the PRIVATE_ vars get values correctly.

Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7
2010-07-13 17:41:14 -07:00
Ying Wang aabbc07cb8 am 90cf34c7: am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread
Merge commit '90cf34c72e204eb1d23f43d1fccbf2076e8ff67b'

* commit '90cf34c72e204eb1d23f43d1fccbf2076e8ff67b':
  Support to build native libraries with prebuilt NDK
2010-07-13 17:26:00 -07:00
Ying Wang 90cf34c72e am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread
Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp

* commit 'f0f60cdd8f4f74b2480774887606afdebec8d891':
  Support to build native libraries with prebuilt NDK
2010-07-13 17:24:09 -07:00
Ying Wang f0f60cdd8f resolved conflicts for merge of 1a08100f to gingerbread
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
2010-07-13 17:21:33 -07:00
Ying Wang 1a08100fa9 Support to build native libraries with prebuilt NDK
Bug: http://b/issue?id=2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
2010-07-13 16:29:18 -07:00
The Android Open Source Project 0e4c0267fb merge from open-source froyo
Change-Id: I2759c464efef13754154310d10816a5781243311
2010-07-13 15:24:07 -07:00
The Android Open Source Project dd0af2517c am 1778b4b1: merge from open-source master
Merge commit '1778b4b11effa15b3b540a5153f68127a9ec6adb'

* commit '1778b4b11effa15b3b540a5153f68127a9ec6adb':
  Move buildspec vars to BoardConfig.mk
2010-07-12 15:22:50 -07:00
The Android Open Source Project f508e251ec am f47b0a17: merge from open-source master
Merge commit 'f47b0a1758a66277d11f362e307f0dd6c183051d'

* commit 'f47b0a1758a66277d11f362e307f0dd6c183051d':
  Add generic_x86-eng to the lunch menu
2010-07-12 15:06:02 -07:00