StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,413 Commits 1 Branch 0 Tags
9113badc39c4d86301277b51a1393258cfbdfe0c
Commit Graph

85413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build SharedAccount
e6da146c3a ERC73 2009-09-11 08:44:45 -07:00
android-build SharedAccount
9544d08bf4 ERC72B 2009-09-10 16:54:48 -07:00
android-build SharedAccount
6b44e3d73e Merge branch 'eclair' into eclair-release 2009-09-10 16:52:21 -07:00
Xavier Ducrohet
a4faa18b6f am 030df428: am 85762123: Merge change 24584 into eclair 
Merge commit '030df428443735eed084286564407198792daa82'

* commit '030df428443735eed084286564407198792daa82':
  Add support for @pending annotation.
 2009-09-10 15:19:55 -07:00
Xavier Ducrohet
c35eaf7e98 am aca5e20e: am a3c35d19: Merge change 24565 into eclair 
Merge commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea'

* commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea':
  Add missing @Override to DroidDoc and ApiCheck
 2009-09-10 15:19:51 -07:00
Xavier Ducrohet
030df42844 am 85762123: Merge change 24584 into eclair 
Merge commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp

* commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83':
  Add support for @pending annotation.
 2009-09-10 15:10:39 -07:00
Xavier Ducrohet
aca5e20e4a am a3c35d19: Merge change 24565 into eclair 
Merge commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp

* commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
  Add missing @Override to DroidDoc and ApiCheck
 2009-09-10 15:10:36 -07:00
Android (Google) Code Review
857621233a Merge change 24584 into eclair 
* changes:
  Add support for @pending annotation.
 2009-09-10 18:03:47 -04:00
Android (Google) Code Review
a3c35d197e Merge change 24565 into eclair 
* changes:
  Add missing @Override to DroidDoc and ApiCheck
 2009-09-10 18:03:32 -04:00
Xavier Ducrohet
02e14df59f Add support for @pending annotation. 
This behaves the same as @hide, but can be used to annotate API that are
only hidden pending API approval.

Change-Id: I4c0bf46c6d74ed45a8890ecdfd9b14ce234a5c18
 2009-09-10 14:50:12 -07:00
Xavier Ducrohet
5ee390d856 Add missing @Override to DroidDoc and ApiCheck 
Change-Id: Ic7829a4ea62a614ef8b525bd84f8fbaaa4674d06
 2009-09-10 14:46:21 -07:00
Andy McFadden
cae7d6735e am 42fe578d: am 2c86bfd2: Sleazy workaround for webkit build failures. 
Merge commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf'

* commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf':
  Sleazy workaround for webkit build failures.
 2009-09-10 10:55:03 -07:00
Andy McFadden
42fe578dae am 2c86bfd2: Sleazy workaround for webkit build failures. 
Merge commit '2c86bfd285d8b3765da0144da31d1a3d216cb95c' into eclair-plus-aosp

* commit '2c86bfd285d8b3765da0144da31d1a3d216cb95c':
  Sleazy workaround for webkit build failures.
 2009-09-10 10:45:25 -07:00
Andy McFadden
2c86bfd285 Sleazy workaround for webkit build failures. 
The WebKit library link line is exceeding 128KB on sim-eng builds.
The path to sim-eng object files is slightly longer than device builds
because the object files live under the "host" directory.

This change truncates the "product" directory name to "pr", reducing the
command line by a few KB.  This only affects sim-eng builds.

The real fix will need be to webkit (see internal bug 1917987), which
will eventually start failing on device builds if it continues to grow.
 2009-09-10 10:05:14 -07:00
The Android Open Source Project
1279563c4b ERC72 2009-09-10 08:37:47 -07:00
Ben Cheng
db95cb4426 Enable Dalvik JIT by default for the master branch. 2009-09-09 13:03:44 -07:00
The Android Open Source Project
d305f54c8e ERC71 2009-09-09 10:44:02 -07:00
The Android Open Source Project
95d30322c5 Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-09 10:43:49 -07:00
Andrei Popescu
03f9f2ee11 am bf9b8e89: am 270de928: Cleanstep required by switching back to JSC in the browser 
Merge commit 'bf9b8e8904b930028adaf94c7139b714cef3d641'

* commit 'bf9b8e8904b930028adaf94c7139b714cef3d641':
  Cleanstep required by switching back to JSC in the browser
 2009-09-08 15:59:59 -07:00
Alexey Tarasov
1fcce11eed Cosmetic fixes in css/js 2009-09-08 15:29:54 -07:00
Andrei Popescu
bf9b8e8904 am 270de928: Cleanstep required by switching back to JSC in the browser 
Merge commit '270de9284a56f1e9646afb1cf7e9f2720ddaa7b0' into eclair-plus-aosp

* commit '270de9284a56f1e9646afb1cf7e9f2720ddaa7b0':
  Cleanstep required by switching back to JSC in the browser
 2009-09-08 13:39:46 -07:00
Andrei Popescu
270de9284a Cleanstep required by switching back to JSC in the browser 2009-09-08 19:47:22 +01:00
The Android Open Source Project
462edda61b ERC70 2009-09-08 07:27:14 -07:00
The Android Open Source Project
c53959fdc1 Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-08 07:26:56 -07:00
android-build SharedAccount
63c11540ac ERC65B - after the fact 2009-09-07 00:40:35 -07:00
Jean-Baptiste Queru
8eb47bb13d am 6d547933: merge from open-source master 
Merge commit '6d547933b8aa3a811499708bc8a4fea551599359'

* commit '6d547933b8aa3a811499708bc8a4fea551599359':
 2009-09-04 11:06:01 -07:00
Jean-Baptiste Queru
6d547933b8 merge from open-source master 2009-09-04 07:50:42 -07:00
Mike Lockwood
451f14f769 am 356f7a2f: am 3e747ac3: Add clean step for /system/bin/bugreport symlink 
Merge commit '356f7a2f15984e499f494f840a6ee0fb8e7826fe'

* commit '356f7a2f15984e499f494f840a6ee0fb8e7826fe':
  Add clean step for /system/bin/bugreport symlink
 2009-09-03 14:24:31 -07:00
Mike Lockwood
356f7a2f15 am 3e747ac3: Add clean step for /system/bin/bugreport symlink 
Merge commit '3e747ac3fe688c231bbf5591ee02226b394adf26' into eclair-plus-aosp

* commit '3e747ac3fe688c231bbf5591ee02226b394adf26':
  Add clean step for /system/bin/bugreport symlink
 2009-09-03 14:21:50 -07:00
Jean-Baptiste Queru
dc785843c7 merge from donut 2009-09-03 14:12:45 -07:00
Mike Lockwood
3e747ac3fe Add clean step for /system/bin/bugreport symlink 
Change-Id: Ib2abb22184b16b6b3c5bc0e38141922f3fcbfca0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-09-03 15:01:07 -04:00
The Android Open Source Project
b3e1907cfc DRC65 2009-09-03 10:40:22 -07:00
The Android Open Source Project
9cc32e3f9c Merge commit 'remotes/goog/donut' into donut-release 2009-09-03 10:40:12 -07:00
The Android Open Source Project
99e6ea3b63 ERC65 2009-09-03 08:36:28 -07:00
The Android Open Source Project
5c744908f5 Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-03 08:36:16 -07:00
Dirk Dougherty
49a92efc18 am 5043a836: am af2a2a61: am 4d545a82: Merge change 23037 into donut 
Merge commit '5043a836a77a623578590a6a76f34e2b121fe1e1'

* commit '5043a836a77a623578590a6a76f34e2b121fe1e1':
  Doc changes for SDK update.
 2009-09-02 19:04:00 -07:00
Dirk Dougherty
5043a836a7 am af2a2a61: am 4d545a82: Merge change 23037 into donut 
Merge commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca' into eclair-plus-aosp

* commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca':
  Doc changes for SDK update.
 2009-09-02 19:01:33 -07:00
Dirk Dougherty
af2a2a61ed am 4d545a82: Merge change 23037 into donut 
Merge commit '4d545a82917db0ca90494e4cfb7944e1b5ea564a' into eclair

* commit '4d545a82917db0ca90494e4cfb7944e1b5ea564a':
  Doc changes for SDK update.
 2009-09-02 18:58:52 -07:00
Android (Google) Code Review
4d545a8291 Merge change 23037 into donut 
* changes:
  Doc changes for SDK update. Update SDK toc template.
 2009-09-02 18:57:09 -07:00
Doug Zongker
dc8d202008 am 0646e78e: am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files 
Merge commit '0646e78e9969762ead938f953c7283d984333d99'

* commit '0646e78e9969762ead938f953c7283d984333d99':
  do a pass of normal-chunk-merging before comparing src and tgt files
 2009-09-02 13:34:19 -07:00
Doug Zongker
99677d23a2 am 279bae71: am 15604b84: use imgdiff -z to diff zipfiles 
Merge commit '279bae719765f4fb9fc372323d680690b5842f90'

* commit '279bae719765f4fb9fc372323d680690b5842f90':
  use imgdiff -z to diff zipfiles
 2009-09-02 13:33:28 -07:00
Doug Zongker
0646e78e99 am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files 
Merge commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54' into eclair-plus-aosp

* commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54':
  do a pass of normal-chunk-merging before comparing src and tgt files
 2009-09-02 11:15:52 -07:00
Doug Zongker
d7d7ab00f5 do a pass of normal-chunk-merging before comparing src and tgt files 
Merge the gzip footer and header together with any adjacent normal
chunks before comparing chunk structures; this should make the
recovery-from-boot diff not fail due to differences in the footer
after the ramdisk part of the image.
 2009-09-02 11:10:51 -07:00
Doug Zongker
279bae7197 am 15604b84: use imgdiff -z to diff zipfiles 
Merge commit '15604b84e246514da6c9721266919003f734380b' into eclair-plus-aosp

* commit '15604b84e246514da6c9721266919003f734380b':
  use imgdiff -z to diff zipfiles
 2009-09-02 08:56:05 -07:00
The Android Open Source Project
d2fd326df4 ERC64 2009-09-02 08:36:47 -07:00
The Android Open Source Project
3a5013d94e DRC63C 2009-09-01 22:14:49 -07:00
Doug Zongker
15604b84e2 use imgdiff -z to diff zipfiles 
imgdiff now understands the zip file format and can produce smaller
patches by doing the patching in uncompressed space.  Start taking
advantage of this for .zip, .apk, and .jar files.
 2009-09-01 17:53:34 -07:00
The Android Open Source Project
b638230512 ERC63B 2009-09-01 15:15:59 -07:00
The Android Open Source Project
f007ed9ce6 Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-01 15:15:44 -07:00
The Android Open Source Project
1b039fc5ac DRC63B 2009-09-01 15:14:42 -07:00