Commit Graph

1358 Commits

Author SHA1 Message Date
Steve Block
e3425a0220 Increase the Retouch buffer size from 550,000 to 600,000
The WebKit merge to r66079 built with JSC JavaScript engine triggers the
overflow.

Change-Id: Ifcb92aa019cfb0e7a93d667e15a792554fc0f676
2010-08-27 13:18:46 +01:00
Ying Wang
a97039890e am ae553143: Refactor a bit.
Merge commit 'ae5531434877478985186dd0fb7ffefa12a74e52' into gingerbread-plus-aosp

* commit 'ae5531434877478985186dd0fb7ffefa12a74e52':
  Refactor a bit.
2010-08-26 16:07:12 -07:00
Ying Wang
ae55314348 Refactor a bit.
Change-Id: I4573e7a5239536f49571d9222865e2526da573c8
2010-08-26 16:04:09 -07:00
Ying Wang
cef82129e1 am aa6dbe21: Try to fix system.img in update zip file.
Merge commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6' into gingerbread-plus-aosp

* commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6':
  Try to fix system.img in update zip file.
2010-08-26 15:25:53 -07:00
Ying Wang
aa6dbe2144 Try to fix system.img in update zip file.
Change-Id: Ic4f1c7478a22b1f8134ac768904e437fcfea700a
2010-08-26 15:16:22 -07:00
Hristo Bojinov
dafb042755 Turn on ASLR by default. The "-a" option now takes an argument (on/off).
Change-Id: I4ddc70f2087c23586fc6aaaff3bb862f83d9779d
2010-08-26 14:37:42 -07:00
Ben Dodson
a2eed2ce03 Merge "Continue to use search.html for site searching" 2010-08-26 09:44:03 -07:00
Ying Wang
f5127dfc3d am 485bd44d: am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit '485bd44d0d78f9f612075e17db1adb281741c84f'

* commit '485bd44d0d78f9f612075e17db1adb281741c84f':
  Fix mkyaffs2image extra flags in the release tools.
2010-08-25 21:21:43 -07:00
Ying Wang
485bd44d0d am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp

* commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d':
  Fix mkyaffs2image extra flags in the release tools.
2010-08-25 21:19:29 -07:00
Ying Wang
d421f57d22 Fix mkyaffs2image extra flags in the release tools.
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
2010-08-25 20:39:41 -07:00
Ying Wang
eb85d8d78e am eed6860d: am 4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit 'eed6860d388f1761405d7165cb4d72e1f038b8a6'

* commit 'eed6860d388f1761405d7165cb4d72e1f038b8a6':
  Fix mkbootimg parameters for releasetools.
2010-08-25 15:13:07 -07:00
Ying Wang
eed6860d38 am 4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd' into gingerbread-plus-aosp

* commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd':
  Fix mkbootimg parameters for releasetools.
2010-08-25 15:04:45 -07:00
Ying Wang
4de6b5bfc8 Fix mkbootimg parameters for releasetools.
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
2010-08-25 14:30:17 -07:00
Bill Napier
1ad1380599 am 0962b719: Merge "DO NOT MERGE: Fix the build by ignoring directories that don\'t exist." into gingerbread
Merge commit '0962b71980b7e850a1ef87766ae12de16ab2efb4' into gingerbread-plus-aosp

* commit '0962b71980b7e850a1ef87766ae12de16ab2efb4':
  DO NOT MERGE: Fix the build by ignoring directories that don't exist.
2010-08-25 10:10:49 -07:00
Bill Napier
10cd7f9969 DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3
2010-08-25 10:00:20 -07:00
Rohit Mungee
cdc1d6f457 am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread
Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp

* commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd':
  Add support for multiple html directories to droiddoc.
2010-08-24 23:01:32 -07:00
Rohit Mungee
cb92616f11 Merge "Add support for multiple html directories to droiddoc." into gingerbread 2010-08-24 22:58:30 -07:00
Bill Napier
0e143c0ed9 Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.

Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
2010-08-24 22:16:01 -07:00
Ben Dodson
07aebf322a Continue to use search.html for site searching
Change-Id: I0e3ef90698c2ac06693eb70f140b26b476d51a22
2010-08-24 17:13:08 -07:00
Ben Dodson
c67e4cb8a1 Updates for new doclava customizations
Change-Id: I98f45e3fe92953968014b2d6589515ca39a5c920
2010-08-24 16:14:18 -07:00
Ben Dodson
d3191f0d71 Adding android-specific customization for warning of minimum api level
Change-Id: Id211e250f3c42d0239ce9bf126a74997c8b0dc3f
2010-08-24 14:39:58 -07:00
Ying Wang
567ec8ede3 am ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Merge commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51' into gingerbread-plus-aosp

* commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51':
  Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
2010-08-24 11:50:46 -07:00
Ying Wang
ee4bad51bc Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Original CL: 59920

Change-Id: I81437996670a61e10284293d25a08da8907ad296
2010-08-24 11:18:07 -07:00
Ying Wang
d3b973d897 am 065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp

* commit '065521be4fd6965058fbd599bb43fe13101fee7c':
  Backport ext4 support from master [DO NOT MERGE]
2010-08-23 11:49:10 -07:00
Ying Wang
065521be4f Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.

Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
2010-08-23 11:34:40 -07:00
Ben Dodson
e7a6af9fe0 Merge "Synchronizing templates with doclava's external ones." 2010-08-17 14:40:42 -07:00
Ben Dodson
834cf50845 Fix for building apicheck tool
Change-Id: If0dafa8e45de6a872bf1cc47942335493e96383b
2010-08-17 11:49:18 -07:00
Ben Dodson
5846ec74cc Removed unused source files. Apicheck and droiddoc are now in external/doclava.
Change-Id: I13bcdbd27214e15235fa9687b6f15f8853f5f448
2010-08-17 11:04:56 -07:00
Hristo Bojinov
b110304662 Merge "Increase the Retouch buffer size." 2010-08-12 11:44:49 -07:00
Ben Murdoch
ae18f064df Increase the Retouch buffer size.
New WebKit merge built with JSC javascript engine triggers the
overflow.

Change-Id: I71a9bbc9b27c9a0e7f3680f20be2696f61c3b266
2010-08-12 12:45:27 +01:00
Ben Dodson
4dbb28ad29 Synchronizing templates with doclava's external ones.
Change-Id: Ida95fd6e2f4eb30fbc9200f585aed9dd20996f78
2010-08-10 18:34:21 -07:00
Ben Dodson
83019ba39c Use doclava for apicheck
Change-Id: I6a84717cf645e2a27cea9271c444d159c82439c5
2010-08-10 16:01:36 -07:00
Ben Dodson
1034455a24 Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava
Change-Id: If317bd108043b152d28babc88a7c949db5127a93
2010-08-05 15:45:10 -07:00
Scott Main
cecf0bee67 am 240782f2: am 6eea9363: am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3'

* commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3':
  update carousel icon for nexus one dev phone
2010-08-05 15:25:15 -07:00
Scott Main
aee274ed4e am b7256fd6: am be4696e0: am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit 'b7256fd6851d90c088b8cc1603fa62faa95714de'

* commit 'b7256fd6851d90c088b8cc1603fa62faa95714de':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:25:12 -07:00
Scott Main
240782f2bd am 6eea9363: am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6' into gingerbread-plus-aosp

* commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6':
  update carousel icon for nexus one dev phone
2010-08-05 15:18:06 -07:00
Scott Main
b7256fd685 am be4696e0: am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit 'be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp

* commit 'be4696e073b93e0e65f767e77166a08efd67c6cb':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:18:03 -07:00
Scott Main
6eea9363f4 am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread

* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
  update carousel icon for nexus one dev phone
2010-08-05 15:10:05 -07:00
Scott Main
be4696e073 am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread

* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:10:03 -07:00
Brian Carlstrom
f9be43305a am 7dc35a3b: Tracking merge of dalvik-dev to gingerbread
Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp

* commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:23 -07:00
Scott Main
4f2436dc35 update carousel icon for nexus one dev phone
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
2010-08-05 09:44:47 -07:00
Brian Carlstrom
7dc35a3b9c Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Colin Cross
48642604fd Disable CheckSize on ext partitions to fix build
Change-Id: I66c67f8bbd84eb9da988b4079ad4c36089c1c930
2010-08-03 22:54:30 -07:00
Ying Wang
ee81cd931c Pass partition size to mkuserimg.sh
Change-Id: Id6a53d8d552e8ce1bdf83fbb756724454e05e5c8
2010-08-03 18:05:25 -07:00
Jing Yu
d1f76461c0 Merge "Make arm-linux-androideabi toolchain the default for Android build." 2010-08-02 20:32:42 -07:00
Hristo Bojinov
96be7205dc Working ASLR implementation.
ASLR for shared libraries is controlled by "-a" in ota_from_target_files.
Binary files are self-contained (supported by apriori/soslim).

Signed-off-by: Hristo Bojinov <hristo@google.com>
Change-Id: I500e325bf4a70a8d69a2ab9b2938e83dadb4e65d
2010-08-02 14:25:01 -07:00
Jing Yu
9d396e37ac Make arm-linux-androideabi toolchain the default for Android build.
androideabi target is already in upstream GCC. The arm-linux-
androideabi toolchain can be built directly from upstream GCC.
Switching from old special tailored arm-eabi toolchain to the new
arm-linux-androideabi toolchain make us closer to the opensource
community and friendly to all toolchain developers.

kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain
path to PATH.

The arm-linux-androideabi-4.4.x toolchain is built with the same
source as the latest arm-eabi-4.4.3 toolchain except for the
target change patches.

Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
2010-07-29 19:09:12 -07:00
Dirk Dougherty
35e642f768 Doc change: Add nexus one to dev phones image.
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
2010-07-23 14:39:41 -07:00
Ying Wang
77c882ff88 Allow PRODUCT_PROPERTY_OVERRIDES to override default locale.
Change-Id: I5147d687750a50cfc186e99a9a8c88d3b2eb1692
If PRODUCT_PROPERTY_OVERRIDES has set default locale, buildinfo.sh skips setting them.
http://b/issue?id=2243115
2010-07-20 18:10:17 -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