Commit graph

2559 commits

Author SHA1 Message Date
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
Mathias Agopian
9967e9dbb8 Merge "add an entry for the new libgui" into gingerbread 2010-07-14 16:31:43 -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
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
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
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
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
Ying Wang
0d205521ae Merge "Enforce 64-bit build environment" into gingerbread 2010-07-09 13:30:14 -07:00
Brian Muramatsu
36b332beca Build Accessibility Tests and APK
Bug 2814482

Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.

Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
2010-07-08 13:05:09 -07:00
Scott Main
38d2e1dacd am b66a5c05: docs: modify redirect link text
Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread

* commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
  docs: modify redirect link text
2010-07-08 11:42:13 -07:00
Scott Main
b66a5c0574 docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
2010-07-08 11:34:45 -07:00
Ying Wang
d2e830b9b4 Enforce 64-bit build environment
We will only support 64-bit build environment from now on.

Change-Id: Ic58cb3e06e7fc9cf19a65e6c05c26f12ff9886b7
2010-07-08 10:06:50 -07:00
Steve Howard
de6a085764 Fix broken interaction of JarJar and Emma.
JarJar, like DX, can't handle the local var corruption that Emma
performs.  To fix this, I'm moving the JarJar step before the Emma
step.

Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
  since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@".  It seems to be
  the convention that such lines print the destination, not the
  source, so I made it consistent.

Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
2010-07-07 18:46:45 -07:00
Ying Wang
8d9cbe557d Add phony target dist_libraries
that is only used to put your library into the dist dir when doing a full build.

Change-Id: I11e9dc15237086843ea4a00736c81ffc680ca12e
2010-07-07 16:57:28 -07:00
David Turner
2b8ba2fa20 Merge "Clean up warnings in soslim" into gingerbread 2010-07-07 14:14:19 -07:00
Steve Howard
750ac4f3a4 Manual merge of change 50994 from master (DO NOT MERGE)
Merging from master because I'm bringing my maps API work into
gingerbread.

Fix and enable JarJar in Java builds.

java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed.  This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.

Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
2010-07-01 19:52:04 -07:00
Ed Heyl
7d735133cd Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/2590492 and requested again

Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d
2010-07-01 10:25:09 -07:00
Ying Wang
ca88861ba6 am 783f449b: Don\'t copy apns-conf.xml for apps-only build
Merge commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread

* commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
  Don't copy apns-conf.xml for apps-only build
2010-06-30 16:34:52 -07:00
Ying Wang
783f449bdc Don't copy apns-conf.xml for apps-only build
http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.

Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
2010-06-30 15:21:27 -07:00
Jean-Baptiste Queru
22d019b51d Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread 2010-06-30 08:58:32 -07:00
The Android Open Source Project
79a8c2e9de set up fast-forward from froyo-release to gingerbread
Change-Id: I91ef2a183f34b54405580498a3cab39ec6dc7f24
2010-06-29 14:34:16 -07:00
Ying Wang
dd2c21550c am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
Merge commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread

* commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
2010-06-29 09:28:56 -07:00
Ying Wang
0af605f3b6 Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo 2010-06-29 09:18:00 -07:00
Kenny Root
afb36e7e86 Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
2010-06-26 22:43:55 -07:00
David 'Digit' Turner
a7f9179ecc Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread 2010-06-25 10:42:42 -07:00
Scott Main
62c6566558 am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into gingerbread

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:12:45 -07:00
Scott Main
81b68ad95d Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo 2010-06-24 18:10:32 -07:00
Ying Wang
c955834ad0 am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 17:59:32 -07:00
Scott Main
a1b358a22c docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS

Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
2010-06-24 17:57:50 -07:00
android-build SharedAccount
9e32ccf59c frf85B
Change-Id: I012a38642e8f0685d9811ec1a4dcb6e3d59d19bd
2010-06-24 16:06:16 -07:00
Ying Wang
c048c9b598 default empty tapas to TARGET_BUILD_APPS "all"
So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.

Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
2010-06-24 15:13:09 -07:00
Andy McFadden
bd960940e1 Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Don't check STAY_OFF_MY_LAWN in set_java_home.  That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.

With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.

Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
2010-06-24 12:52:51 -07:00
android-build SharedAccount
3ee659d97a frf85
Change-Id: Ib1a8aa2cd4e652a46f70c54540afc2ea87724779
2010-06-24 12:28:31 -07:00
James Dong
c1ab82ae6b Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread 2010-06-24 11:55:40 -07:00
Ying Wang
8e6f821e73 Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2
2010-06-24 11:10:07 -07:00
James Dong
d891654b0c Use stagefright (instead of OpenCore) authoring engine by default
-rebased

Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834
2010-06-24 09:53:35 -07:00
Andreas Huber
f2bab487cc Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread 2010-06-24 09:05:19 -07:00
Ying Wang
7b142da3ce Fix javadoc for Java 6.
If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException

Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6
2010-06-23 20:59:22 -07:00
Andreas Huber
e3bbae0382 Remove now unnecessary property overrides to opt into stagefright.
Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug: 2370115
2010-06-23 16:55:06 -07:00
android-build SharedAccount
61d1cc3c32 frf84B
Change-Id: I44d0d9d2e9bec68089b1e2d4dee5bd74a847ead1
2010-06-23 15:44:01 -07:00
android-build SharedAccount
88c6cdc19c frf84
Change-Id: Icb9eb9a74294965302cb7bc5ebddb4939953487d
2010-06-23 15:37:41 -07:00
Joe Onorato
aee4daacc8 The java version changed, and we made envsetup automatically find the right JAVA_HOME.
This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee
2010-06-23 14:03:13 -07:00