Commit graph

1571 commits

Author SHA1 Message Date
Xavier Ducrohet
5551535ffa am 3509469b: am 4216a8c9: Add the host notice file to the SDK platform-tools folder.
* commit '3509469b43976cddf2ec4fc8a1020722dc214caf':
  Add the host notice file to the SDK platform-tools folder.
2011-03-15 13:53:08 -07:00
Xavier Ducrohet
3509469b43 am 4216a8c9: Add the host notice file to the SDK platform-tools folder.
* commit '4216a8c94e320b7025acd6bf99bac4f9ae45c5c7':
  Add the host notice file to the SDK platform-tools folder.
2011-03-15 13:50:56 -07:00
Ying Wang
d18769c4c5 Merge "Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG" 2011-03-15 13:40:02 -07:00
Xavier Ducrohet
4216a8c94e Add the host notice file to the SDK platform-tools folder.
Change-Id: Id9e789fed635c6e5b43254f8ef6ec353302ca1be
2011-03-15 13:28:40 -07:00
Ying Wang
4f1ab92aac Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG
With this change, PRODUCT_LOCALES will contain only locales.
Other aapt config flags, such as *dpi, small/normal/large/xlarge,
should go to PRODUCT_AAPT_CONFIGS.
Bug: 4086309

Change-Id: I922f153d79777a9522c542a3907111193b40e7b7
2011-03-15 13:19:30 -07:00
David 'Digit' Turner
8c675d2293 am 16e7050c: am e9b1d0ee: am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
* commit '16e7050cbaa292c0f36275cdb4c56f357cbfa79a':
  Allow win_sdk build with USE_CCACHE=1
2011-03-15 04:13:24 -07:00
David 'Digit' Turner
16e7050cba am e9b1d0ee: am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
* commit 'e9b1d0eee715895f156c8e2601d5b1996919da6d':
  Allow win_sdk build with USE_CCACHE=1
2011-03-15 04:09:34 -07:00
David 'Digit' Turner
e9b1d0eee7 am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
* commit 'f8f95fc8b1a1eb19812fc55b230da3bfbe5272e5':
  Allow win_sdk build with USE_CCACHE=1
2011-03-15 03:59:52 -07:00
David 'Digit' Turner
f8f95fc8b1 Merge "Allow win_sdk build with USE_CCACHE=1" 2011-03-15 03:31:19 -07:00
David 'Digit' Turner
55aad08663 Allow win_sdk build with USE_CCACHE=1
This patch allows the Window sdk build (lunch sdk-eng; make win_sdk)
to work properly when USE_CCACHE is defined in the environment.

There is no Windows ccache prebuilt, but since we're cross-compiling
from Linux, detect it and use the linux prebuilt binary instead.

Note: Depends on https://review.source.android.com//#change,21755
      for a complete solution to the problem.

Change-Id: I0b1b59efae86ee7114225258c9ecf9f257913347
2011-03-15 01:01:32 +01:00
Ying Wang
374b3256d2 Make a copy of symbol files after prelinking is removed.
Change-Id: I1628b54fc747154d48f213c634b081e43eb41696
2011-03-14 11:44:57 -07:00
Iliyan Malchev
b375e71d30 build: remove prelinker build build system
This patch removes support for prelinking from the build system.  By now, the
prelinker has outlived its usefulness for several reasons.  Firstly, the
speedup that it afforded in the early days of Android is now nullified by the
speed of hardware, as well as by the presence of Zygote.  Secondly, the space
savings that come with prelinking (measued at 17MB on a recent honeycomb
stingray build) are no longer important either.  Thirdly, prelinking reduces
the effectiveness of Address-Space-Layout Randomization.  Finally, since it is
not part of the gcc suite, the prelinker needs to be maintained separately.

The patch deletes apriori, soslim, lsd, isprelinked, and iself from the source
tree.  It also removes the prelink map.

LOCAL_PRELINK_MODULE becomes a no-op.  Individual Android.mk will get cleaned
separately.  Support for prelinking will have to be removed from the recovery
code and from the dynamic loader as well.

Change-Id: I5839c9c25f7772d5183eedfe20ab924f2a7cd411
2011-03-12 14:59:46 -08:00
Raphael Moll
2cfffcb606 am 8755e2b2: am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
* commit '8755e2b2c21dd54063fcb62c26c4a2d3575610cf':
  Fix find-jdk-tools-jar to be cygwin-friendly.
2011-03-11 16:05:53 -08:00
Raphael Moll
8755e2b2c2 am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
* commit 'e84739e942d19955248e1fc1ce966d56543eaf0e':
  Fix find-jdk-tools-jar to be cygwin-friendly.
2011-03-10 12:46:12 -08:00
Raphael Moll
e84739e942 Merge "Fix find-jdk-tools-jar to be cygwin-friendly." 2011-03-10 12:29:20 -08:00
Dianne Hackborn
8046557f94 am 59daa2bc: It\'s a new version!
* commit '59daa2bc61ff0992f792a50dd413dcedd6359cf4':
  It's a new version!
2011-03-09 18:31:37 -08:00
Dianne Hackborn
59daa2bc61 It's a new version!
Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
2011-03-09 18:20:40 -08:00
Ying Wang
f8a7ff191a resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp
Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
2011-03-09 17:02:35 -08:00
Ying Wang
123995f9e1 am be188caf: Dist build.prop in sdk builds.
* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
  Dist build.prop in sdk builds.
2011-03-09 16:47:27 -08:00
Raphael Moll
4de32c69c7 Fix find-jdk-tools-jar to be cygwin-friendly.
Change-Id: I9cf2035026725fd1ba8a014b484262ed1acc1df4
2011-03-08 14:29:25 -08:00
Ying Wang
be188cafd2 Dist build.prop in sdk builds.
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
2011-03-08 14:05:51 -08:00
Ed Heyl
24297cabf4 Merge "version bump for new release (please don't merge)" into gingerbread 2011-03-08 12:35:20 -08:00
Ed Heyl
3c83a5aeb9 version bump for new release (please don't merge)
Change-Id: I94081a1288da434811a1ddaa8a7b7b5da13d9341
2011-03-07 18:08:24 -08:00
David Turner
1c908fa188 am b9c627c6: am 0683a773: Merge "x86: Use GCC 4.4.3"
* commit 'b9c627c6a0c6f0af57d0912175bfc739b0eb6249':
  x86: Use GCC 4.4.3
2011-03-07 13:45:59 -08:00
David Turner
b9c627c6a0 am 0683a773: Merge "x86: Use GCC 4.4.3"
* commit '0683a77348f2a0a529a8e2bcfdf4b6dc6b4c5f5b':
  x86: Use GCC 4.4.3
2011-03-07 13:35:02 -08:00
Ying Wang
70d6ec5f9b resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp
Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d
2011-03-07 11:07:12 -08:00
Ying Wang
582222190f am 9238d44c: Only copy once even if the first matched src:dest pair appears more than once.
* commit '9238d44c92b355bac6b7a13b23f298336338bf3d':
  Only copy once even if the first matched src:dest pair appears more than once.
2011-03-04 17:13:08 -08:00
Ying Wang
0a1f3236e3 am a73b6561: Drop support for target files with no recovery.fstab.
* commit 'a73b6561cee39ad416f4af327dbe72ec565d2423':
  Drop support for target files with no recovery.fstab.
2011-03-04 17:13:04 -08:00
David Turner
0683a77348 Merge "x86: Use GCC 4.4.3" 2011-03-04 16:39:26 -08:00
Ying Wang
9238d44c92 Only copy once even if the first matched src:dest pair appears more than once.
Change-Id: I476923007dac1174371d6e6526d72182eb6c7243
2011-03-04 15:10:15 -08:00
Ying Wang
a73b6561ce Drop support for target files with no recovery.fstab.
Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.
2011-03-04 14:42:13 -08:00
Ying Wang
7ee6c4033b Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: I3d49d5a2d0e1b6bf26a0e1df0df2d6d7e026f85a
2011-03-04 11:21:38 -08:00
Ying Wang
cce4c973e4 Support stl variants when LOCAL_NDK_VERSION is set.
LOCAL_NDK_STL_VARIANT can be set to system, stlport_static, stlport_shared
or gnustl_static. It defaults to system.

Change-Id: I2840d30ff732a00bc0ea70eab8a8179aea0abbdf
2011-03-04 10:48:28 -08:00
Ying Wang
a67ce69e9a Handle MODULE_LICENSE_MPL the same as MODULE_LICENSE_GPL.
Change-Id: Iefc6df3f3401a591f53ec3f22202044c60acf460
2011-03-03 14:57:10 -08:00
Ying Wang
2adc50374a sdk.atree does not need DIST_DIR any longer.
Change-Id: I34d8f13e1ddc27f853e3f15cfe0351d780a47aa8
2011-03-01 16:13:41 -08:00
Bruce Beare
a17b91faa4 x86: Use GCC 4.4.3
Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767
Author:    H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-01 13:04:24 -08:00
Raphael Moll
b48e7c400b Pass DIST_DIR to sdk.atree
Change-Id: I224781b13bfbf11de553d201b4c2214f93235a67
2011-03-01 11:14:07 -08:00
Raphael
3e54830dc8 Fix for SDK repository.
Change-Id: Ia1245226c451ed4539a0a0cd51022a3325f4b33b
2011-02-23 22:34:16 -08:00
Ying Wang
c4e93b7e11 Merge "Add stl include path if LOCAL_NDK_VERSION is set" 2011-02-23 15:33:27 -08:00
Doug Zongker
419e19121c am 5e2afb97: am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file
* commit '5e2afb977fcec46e001ac57cc76d3b9534696afa':
  force inclusion of system log tags in the event-log-tags file
2011-02-23 13:34:59 -08:00
Doug Zongker
5e2afb977f am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file
* commit 'eaa464e6c4064ce8359d3e5871e0d184388457b8':
  force inclusion of system log tags in the event-log-tags file
2011-02-23 13:31:15 -08:00
Doug Zongker
eaa464e6c4 am a34fa95c: force inclusion of system log tags in the event-log-tags file
* commit 'a34fa95c164a9388ed0b84b17a63241bffd4132a':
  force inclusion of system log tags in the event-log-tags file
2011-02-23 13:25:45 -08:00
Doug Zongker
a34fa95c16 force inclusion of system log tags in the event-log-tags file
Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3
2011-02-23 12:17:29 -08:00
Ying Wang
2f76c6d11b Add stl include path if LOCAL_NDK_VERSION is set
Since NDKr5 the stl headers reside in a separate directory.

Change-Id: I98f37b593560a1a2a55418f8ba413ca842ed37ef
2011-02-23 10:07:03 -08:00
Raphael
336cd7dcb0 Merge "Build SDK repository" 2011-02-22 14:36:00 -08:00
Kenny Root
1b8798894c resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp
Change-Id: I06b2fba1d14343bf0489447a01bb7d0bdb675307
2011-02-22 11:13:23 -08:00
Jeff Brown
f24495f7da Remove obsolete kcm tool.
Change-Id: Ib5aa60cd9d308ce7c672c57513bdcf78e0f1080d
2011-02-19 05:22:55 -08:00
Gloria Wang
3340d2fcde Remove libwvm.so from the prelink map
Change-Id: If6494cd3e92fef571e8ddf40f0b4c19bee7c9ae6
2011-02-18 23:21:41 -08:00
Gloria Wang
49b2af4b99 Merge "Add libwvm.so" 2011-02-18 16:39:53 -08:00
Brett Chabot
9437cf2589 am a3c3bc33: am a29d7e4b: Merge "Build cts-tradefed README into cts.zip" into honeycomb
* commit 'a3c3bc336600bb30680adb920e0b17b28e250dc0':
  Build cts-tradefed README into cts.zip
2011-02-18 15:54:59 -08:00