openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
2,978 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

2978 Commits

Author SHA1 Message Date
Chung-yih Wang 9b7ebf5dbd am 1a2649f0: Merge "Add voip(SIP related codes) into framework." into gingerbread 
Merge commit '1a2649f0da35218748db5aa02c9969246a714b8f' into gingerbread-plus-aosp

* commit '1a2649f0da35218748db5aa02c9969246a714b8f':
  Add voip(SIP related codes) into framework.
 2010-08-05 19:37:54 -07:00
Chung-yih Wang 1a2649f0da Merge "Add voip(SIP related codes) into framework." into gingerbread 2010-08-05 19:35:35 -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
Scott Main 7589398cf9 Merge "Doc change: Add nexus one to dev phones image." into froyo 2010-08-05 08:05:37 -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
Chung-yih Wang ab8ed58c63 Add voip(SIP related codes) into framework. 
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
 2010-08-05 11:31:07 +08:00
android-build SharedAccount 404cd14806 33b special 
Change-Id: I025cf8d2db61752e6816a3ca726445fd869bbc57
 2010-08-03 22:24:15 -07:00
android-build SharedAccount 69e381b3be FRG33 
Change-Id: I04cafed766813daf17316651bf5403c3e4823a74
 2010-08-02 14:03:32 -07:00
Ying Wang 33c11ac3f1 am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo 
Merge commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4' into gingerbread-plus-aosp

* commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4':
  Dist apkcerts.txt for unbundled builds
 2010-07-29 10:30:13 -07:00
Ying Wang e1f37ba0cf am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo 
Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
  Dist apkcerts.txt for unbundled builds
 2010-07-29 10:27:45 -07:00
Ying Wang 55edb20e24 Merge "Dist apkcerts.txt for unbundled builds" into froyo 2010-07-29 10:21:15 -07:00
Xavier Ducrohet 4527075964 am e743c53b: Package ddmlib-prebuilt with CTS. 
Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp

* commit 'e743c53b88faf35be47667b0252c881c7b32f856':
  Package ddmlib-prebuilt with CTS.
 2010-07-28 15:14:51 -07:00
The Android Open Source Project 636e6dec48 am 609fef71: am 3a0576a4: merge from open-source froyo 
Merge commit '609fef7173a1278cb79d7aefdd22a22547648cab' into gingerbread-plus-aosp

* commit '609fef7173a1278cb79d7aefdd22a22547648cab':
 2010-07-28 11:47:24 -07:00
The Android Open Source Project 609fef7173 am 3a0576a4: merge from open-source froyo 
Merge commit '3a0576a41881ceb11c3b11642666abc2f3d5a271' into gingerbread

* commit '3a0576a41881ceb11c3b11642666abc2f3d5a271':
 2010-07-28 11:35:24 -07:00
The Android Open Source Project 3a0576a418 merge from open-source froyo 
Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f
 2010-07-28 11:24:38 -07:00
Xavier Ducrohet e743c53b88 Package ddmlib-prebuilt with CTS. 
This ensures that CTS is using a compatible ddmlib.

Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
 2010-07-28 11:07:31 -07:00
The Android Open Source Project dbaff11c84 reconcile forked froyos 
Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
 2010-07-28 10:41:54 -07:00
aimitakeshi 2bdf2653dc add drm/ directory to include it as part of frameworks 
Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
 2010-07-27 08:34:47 +09:00
The Android Open Source Project 4e8e998ecc am 989fade3: am af44485f: merge from open-source froyo 
Merge commit '989fade304ef5253b5b401f347e26f768d75f35f' into gingerbread-plus-aosp

* commit '989fade304ef5253b5b401f347e26f768d75f35f':
  Include Test Case List from CTS Project
 2010-07-26 12:25:52 -07:00
The Android Open Source Project 989fade304 am af44485f: merge from open-source froyo 
Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
  Include Test Case List from CTS Project
 2010-07-26 12:06:35 -07:00
The Android Open Source Project af44485fe8 merge from open-source froyo 
Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
 2010-07-26 12:02:01 -07:00
Evan Charlton 606540b739 resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp 
Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d
 2010-07-26 08:53:19 -07:00
Chih-Wei Huang 2467fe24f0 Add atom optimization flags 
To enable the optimization, set TARGET_ARCH_VARIANT := x86-atom.

Change-Id: I6b7798944bb8262bd83a76712419d8a77d3c34e9
 2010-07-26 10:41:38 +08:00
Ying Wang efb2168266 Dist apkcerts.txt for unbundled builds 
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
 2010-07-23 16:42:13 -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
Evan Charlton f2bfa76cf8 resolved conflicts for merge of 121a7873 to gingerbread 
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
 2010-07-23 12:21:48 -07:00
Jean-Baptiste Queru 44d628540c am 8339ba91: Merge "Replaced AlarmClock with DeskClock" 
Merge commit '8339ba912d2932a1caad24a3977ddeca0c549c48' into gingerbread-plus-aosp

* commit '8339ba912d2932a1caad24a3977ddeca0c549c48':
  Replaced AlarmClock with DeskClock
 2010-07-23 11:36:58 -07:00
Jean-Baptiste Queru 8339ba912d Merge "Replaced AlarmClock with DeskClock" 2010-07-23 11:25:51 -07:00
Christian Mehlmauer 5022d63cd2 Replaced AlarmClock with DeskClock 
Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24
 2010-07-23 20:09:54 +02:00
Evan Charlton 121a78733a Packages can specify where to find AndroidManifest.xml 
By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.

Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
 2010-07-23 11:03:29 -07:00
android-build SharedAccount 0b991a158b FRG22 
Change-Id: Ie91f0556bd5e89e8b6640f0a7de1b914558bb564
 2010-07-22 22:16:06 -07:00
Ying Wang 3986feae32 am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path 
Merge commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217' into gingerbread-plus-aosp

* commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217':
  Add JNI_H_INCLUDE as default header search path
 2010-07-22 17:52:01 -07:00
Ying Wang ef5bf469fa am bce4b75f: Add JNI_H_INCLUDE as default header search path 
Merge commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441' into gingerbread

* commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441':
  Add JNI_H_INCLUDE as default header search path
 2010-07-22 17:49:13 -07:00
Ying Wang bce4b75fa7 Add JNI_H_INCLUDE as default header search path 
So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.

Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
 2010-07-22 15:58:19 -07:00
Brian Muramatsu fa3d88f884 Include Test Case List from CTS Project 
Bug 2732160

Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.

Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
 2010-07-22 14:46:53 -07:00
The Android Open Source Project 85581a1ba8 merge from open-source master 
Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab
 2010-07-22 11:31:59 -07:00
Ying Wang b96e8a8cc6 am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo 
Merge commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7' into gingerbread-plus-aosp

* commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
 2010-07-22 11:06:26 -07:00
Ying Wang 163ce0f62f am ebf93bb5: am 75b28573: Fix sim build for unbundling native code 
Merge commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460' into gingerbread-plus-aosp

* commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460':
  Fix sim build for unbundling native code
 2010-07-22 11:06:23 -07:00
Ying Wang d9dea715e5 am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo 
Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread

* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
 2010-07-22 10:58:14 -07:00
Ying Wang ebf93bb5c4 am 75b28573: Fix sim build for unbundling native code 
Merge commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c' into gingerbread

* commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c':
  Fix sim build for unbundling native code
 2010-07-22 10:58:12 -07:00
Ying Wang d5c217aca1 Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo 2010-07-22 10:51:03 -07:00
Ying Wang 0188414bc6 add phony target "all_modules" and use it as make goal for "mm"/"mmm" 
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
 2010-07-20 16:18:16 -07:00
Jeffrey Chyan 7adbf97d11 Allow explicit warnings for projects 
Enabled compiler warnings by default and then modified javac
command to include warnings only if a project's warning flag,
LOCAL_WARNINGS_ENABLE, is set to true.

Change-Id: I5111d16a862f3afaaf1dcba2f2c2b7fc072613f1
 2010-07-20 15:32:21 -07:00
The Android Open Source Project fa2d8ace56 merge from open-source master 
Change-Id: Ib0c0f02bb8fc87c3221fd9d2387a46b579a8ce40
 2010-07-16 13:03:44 -07:00
Ying Wang 75b28573fe Fix sim build for unbundling native code 
NDK does not support sim build.

Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28
 2010-07-16 11:34:36 -07:00