StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,223 Commits 1 Branch 0 Tags
fe75781ee9b51bc1266f5e9d002637c53cd3c92c
Commit Graph

2223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
c5bb74fbef ERD71B 2009-12-10 11:17:20 -08:00
Doug Zongker
a492ecce75 am fe8ff19a: Merge change Ief993a27 into eclair-mr2 
Merge commit 'fe8ff19a2a0698d43868c86b5cead0553bdef8ea' into eclair-mr2-plus-aosp

* commit 'fe8ff19a2a0698d43868c86b5cead0553bdef8ea':
  add signing checker script to releasetools
 2009-12-10 09:42:10 -08:00
Android (Google) Code Review
fe8ff19a2a Merge change Ief993a27 into eclair-mr2 
* changes:
  add signing checker script to releasetools
 2009-12-10 09:37:19 -08:00
Jean-Baptiste Queru
d20ccb2361 manual merge 2009-12-10 09:31:38 -08:00
The Android Automerger
23747235d5 ERD71 2009-12-10 09:01:57 -08:00
The Android Automerger
fb450c7bc7 Merge branch 'eclair' into eclair-release 2009-12-10 09:01:32 -08:00
Ravi K Yenduri
b7c844e7cf Enable building for simulator 2009-12-10 15:04:19 +05:30
Scott Main
8625adde23 am 1dd6ff63: Merge change I483cf38d into eclair 
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-plus-aosp

* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
  docs: add "figure" class for DIV elements that contain
 2009-12-09 18:17:50 -08:00
Android (Google) Code Review
1dd6ff638f Merge change I483cf38d into eclair 
* changes:
  docs: add "figure" class for DIV elements that contain a figure image with caption text.
 2009-12-09 18:13:09 -08:00
Scott Main
483cf38d8d docs: add "figure" class for DIV elements that contain 
a figure image with caption text.

needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
 2009-12-09 18:08:32 -08:00
Doug Zongker
23c1f0ca7d am 5ae770fc: add option to @hide classes generated from .logtags files 
Merge commit '5ae770fc0e43172e1efc5146a38e7d1f452143e2' into eclair-mr2-plus-aosp

* commit '5ae770fc0e43172e1efc5146a38e7d1f452143e2':
  add option to @hide classes generated from .logtags files
 2009-12-09 16:01:33 -08:00
Jean-Baptiste Queru
7130f1c7ab am 3a59b2ce: Remove Google-specific files 
Merge commit '3a59b2ceb9fee68eef0428e5458edfbb9e09936c' into eclair-mr2-plus-aosp

* commit '3a59b2ceb9fee68eef0428e5458edfbb9e09936c':
  Remove Google-specific files
 2009-12-09 15:54:11 -08:00
Jean-Baptiste Queru
d48054d52c am 6254132a: remove old p4->git import history 
Merge commit '6254132a3e1a850231f51cbead46891ced7aa083' into eclair-mr2-plus-aosp

* commit '6254132a3e1a850231f51cbead46891ced7aa083':
  remove old p4->git import history
 2009-12-09 15:54:07 -08:00
Ying Wang
92269fdd4f am 6ef046c8: Fixes ProGuard options. 
Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-plus-aosp

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
  Fixes ProGuard options.
 2009-12-09 14:59:19 -08:00
The Android Automerger
5b2eaaa161 ERD70B 2009-12-09 14:46:56 -08:00
Ying Wang
6ef046c893 Fixes ProGuard options. 
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
 2009-12-09 14:31:22 -08:00
Doug Zongker
5ae770fc0e add option to @hide classes generated from .logtags files 
Generate a javadoc @hide comment on the class when "option
javadoc_hide true" is specified in the input .logtags file.
 2009-12-09 12:31:00 -08:00
Doug Zongker
75f1736469 add signing checker script to releasetools 
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files.  It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
 2009-12-09 09:36:41 -08:00
The Android Automerger
3ad6888c4a ERD70 2009-12-09 08:50:44 -08:00
Jean-Baptiste Queru
3a59b2ceb9 Remove Google-specific files 
Also remove unused configuration
 2009-12-08 15:11:04 -08:00
Scott Main
e79b9dfc06 am 0be5c863: am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair 
Merge commit '0be5c863a204cc37fda35574c3111ac363b26b17'

* commit '0be5c863a204cc37fda35574c3111ac363b26b17':
  docs: add context coloring to code snippets with prettify script
 2009-12-08 14:51:26 -08:00
Jean-Baptiste Queru
6254132a3e remove old p4->git import history 2009-12-08 14:02:18 -08:00
The Android Automerger
84a7f11cac ERD69 2009-12-08 08:49:07 -08:00
The Android Automerger
b676019a18 Merge branch 'eclair' into eclair-release 2009-12-08 08:48:45 -08:00
Mike Lockwood
c7b8601d49 am b1665953: am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2 
Merge commit 'b16659533e55476bbe2c0b177943ef8f4129e34a'

* commit 'b16659533e55476bbe2c0b177943ef8f4129e34a':
  Add clean step for switching GPS API from pdapi to loc_api
 2009-12-07 18:32:14 -08:00
Scott Main
0be5c863a2 am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair 
Merge commit 'a2496682f9c6f9311199df7300bb8e16298cf40d' into eclair-mr2-plus-aosp

* commit 'a2496682f9c6f9311199df7300bb8e16298cf40d':
  docs: add context coloring to code snippets with prettify script
 2009-12-07 16:39:04 -08:00
Scott Main
a2496682f9 am 9b0ad4c7: Merge change I79580117 into eclair 
Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-mr2

* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
  docs: add context coloring to code snippets with prettify script
 2009-12-07 16:34:01 -08:00
Scott Main
7fd7dc46f5 am 9b0ad4c7: Merge change I79580117 into eclair 
Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-plus-aosp

* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
  docs: add context coloring to code snippets with prettify script
 2009-12-07 16:33:18 -08:00
Android (Google) Code Review
9b0ad4c725 Merge change I79580117 into eclair 
* changes:
  docs: add context coloring to code snippets with prettify script
 2009-12-07 16:29:47 -08:00
android-build SharedAccount
228fd8d115 ERD68B 2009-12-07 16:29:16 -08:00
Bjorn Bringert
b3be6d72a1 am fe8ab167: am e15968b4: Clean step for the move of SearchableInfo to android.app 
Merge commit 'fe8ab167caa0fb93d068a6f93932f9ce3115c327'

* commit 'fe8ab167caa0fb93d068a6f93932f9ce3115c327':
  Clean step for the move of SearchableInfo to android.app
 2009-12-07 14:58:53 -08:00
Doug Zongker
8c704cc750 am e1f8ec91: am 56a01cbb: am e81271f5: Merge change Id97eba9f into eclair 
Merge commit 'e1f8ec918e5e257feb0f6d1fcdf984ec7e591830'

* commit 'e1f8ec918e5e257feb0f6d1fcdf984ec7e591830':
  don't add "ota-rel-keys" tag to build fingerprints
 2009-12-07 14:58:50 -08:00
The Android Automerger
fa20cafbd8 ERD68 2009-12-07 08:29:34 -08:00
The Android Automerger
bcc47cd11d Merge branch 'eclair' into eclair-release 2009-12-07 08:29:12 -08:00
Mike Lockwood
b16659533e am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2 
Merge commit '623a5572e894c2114767f5631165354076d0b139' into eclair-mr2-plus-aosp

* commit '623a5572e894c2114767f5631165354076d0b139':
  Add clean step for switching GPS API from pdapi to loc_api
 2009-12-07 08:09:53 -08:00
Mike Lockwood
623a5572e8 resolved conflicts for merge of 882ad42e to eclair-mr2 
Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587
 2009-12-07 10:52:22 -05:00
Mike Lockwood
4d523a163a am 882ad42e: Add clean step for switching GPS API from pdapi to loc_api 
Merge commit '882ad42e0de35d86f2361867e3efc497002b73e6' into eclair-plus-aosp

* commit '882ad42e0de35d86f2361867e3efc497002b73e6':
  Add clean step for switching GPS API from pdapi to loc_api
 2009-12-07 07:34:43 -08:00
Mike Lockwood
882ad42e0d Add clean step for switching GPS API from pdapi to loc_api 
Change-Id: Ifa75b0865b547f5e643a4466f13ec7485e902e5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-12-07 07:23:25 -05:00
Bjorn Bringert
fe8ab167ca am e15968b4: Clean step for the move of SearchableInfo to android.app 
Merge commit 'e15968b47a30fb6411a682ac06a5d93ea89011b0' into eclair-mr2-plus-aosp

* commit 'e15968b47a30fb6411a682ac06a5d93ea89011b0':
  Clean step for the move of SearchableInfo to android.app
 2009-12-05 12:38:22 -08:00
Doug Zongker
e1f8ec918e am 56a01cbb: am e81271f5: Merge change Id97eba9f into eclair 
Merge commit '56a01cbb5cc11bedeef2f033fc31e370c7401f4a' into eclair-mr2-plus-aosp

* commit '56a01cbb5cc11bedeef2f033fc31e370c7401f4a':
  don't add "ota-rel-keys" tag to build fingerprints
 2009-12-05 12:38:19 -08:00
Bjorn Bringert
e15968b47a Clean step for the move of SearchableInfo to android.app 
This is part of http://b/issue?id=2270838

Change-Id: I4f70549f0a15e5c90fa5297a2af9f872bb5312a1
 2009-12-05 18:24:52 +00:00
Doug Zongker
6c5a1ceed9 am 95137c3d: am 6c4a70c6: Merge change I672b05c4 into eclair-mr2 
Merge commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e'

* commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e':
  make build depend on event-log-tags file
 2009-12-04 10:43:36 -08:00
Doug Zongker
e6ffd9d8be am e81271f5: Merge change Id97eba9f into eclair 
Merge commit 'e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-plus-aosp

* commit 'e81271f526db01af84eabdd99d309c9425d3f1a3':
  don't add "ota-rel-keys" tag to build fingerprints
 2009-12-04 10:41:05 -08:00
Dianne Hackborn
fef125ec59 am af5cb904: am 176c758c: Change version to MR2 development. 
Merge commit 'af5cb9042497509fb75060667f5ca921c10218a6'

* commit 'af5cb9042497509fb75060667f5ca921c10218a6':
  Change version to MR2 development.
 2009-12-04 10:41:00 -08:00
Doug Zongker
56a01cbb5c am e81271f5: Merge change Id97eba9f into eclair 
Merge commit 'e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-mr2

* commit 'e81271f526db01af84eabdd99d309c9425d3f1a3':
  don't add "ota-rel-keys" tag to build fingerprints
 2009-12-04 10:40:59 -08:00
Doug Zongker
95137c3dfe am 6c4a70c6: Merge change I672b05c4 into eclair-mr2 
Merge commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp

* commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944':
  make build depend on event-log-tags file
 2009-12-04 10:40:39 -08:00
Dianne Hackborn
af5cb90424 am 176c758c: Change version to MR2 development. 
Merge commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc' into eclair-mr2-plus-aosp

* commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc':
  Change version to MR2 development.
 2009-12-04 10:37:09 -08:00
Android (Google) Code Review
e81271f526 Merge change Id97eba9f into eclair 
* changes:
  don't add "ota-rel-keys" tag to build fingerprints
 2009-12-04 10:36:44 -08:00
Android (Google) Code Review
6c4a70c64d Merge change I672b05c4 into eclair-mr2 
* changes:
  make build depend on event-log-tags file
 2009-12-04 10:36:31 -08:00
Doug Zongker
672b05c47c make build depend on event-log-tags file 
Oops, I forgot to make the build actually require the event-log-tags file.
 2009-12-04 10:05:20 -08:00