Commit Graph

2998 Commits

Author SHA1 Message Date
Colin Cross e0a40217df Pass partition sizes to make_ext4fs
Change-Id: I81e84ca02e4326989d25f7d43306c56cdc39348c
2010-08-03 14:50:41 -07:00
Colin Cross 9dd4ba88ee Add dependencies on make_ext4fs
Change-Id: I6e3a6ba33fd9e0ce35137f6e2f60d01521af4cb9
2010-08-03 14:50:32 -07:00
Ying Wang 778c2b6900 am 33c11ac3: am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '33c11ac3f150a388ebf2df80a42b577c136282de'

* commit '33c11ac3f150a388ebf2df80a42b577c136282de':
  Dist apkcerts.txt for unbundled builds
2010-07-29 10:32:19 -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 c350a66807 am 45270759: am e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit '45270759642c03bdbe39ae261e22160d2c64ecec'

* commit '45270759642c03bdbe39ae261e22160d2c64ecec':
  Package ddmlib-prebuilt with CTS.
2010-07-28 15:17:09 -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
Jing Yu 8e06aa9bd6 Merge "Group needed libraries together to solve the cyclic dependence between libc, libc_nomalloc and libgcc. When building with upcoming arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a and defined by libc.a or libc_nomalloc.a.which." 2010-07-28 14:47:15 -07:00
The Android Open Source Project d12d7367db am 636e6dec: am 609fef71: am 3a0576a4: merge from open-source froyo
Merge commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc'

* commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc':
2010-07-28 11:48:46 -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
Dianne Hackborn 79b4be961b Change version codename.
Change-Id: I0bee8d54cf50448f53133eaae64bc0e57781d4ed
2010-07-27 14:59:24 -07:00
Ying Wang f671d9ae46 Add $(LOCAL_MODULE) as part of the installed path.
Change-Id: If691e263f157aa0d123c0e3fe3c9698bbbf58c96
2010-07-26 16:25:55 -07:00
The Android Open Source Project 83ef704944 am 4e8e998e: am 989fade3: am af44485f: merge from open-source froyo
Merge commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4'

* commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4':
  Include Test Case List from CTS Project
2010-07-26 12:31:21 -07: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 9b6865f826 am 606540b7: resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp
Merge commit '606540b739599c8f079baa2a03b5f0501b148eb2'

* commit '606540b739599c8f079baa2a03b5f0501b148eb2':
  Packages can specify where to find AndroidManifest.xml
2010-07-26 10:31:25 -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
Ying Wang efb2168266 Dist apkcerts.txt for unbundled builds
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
2010-07-23 16:42:13 -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 1812dfdaf4 am 44d62854: am 8339ba91: Merge "Replaced AlarmClock with DeskClock"
Merge commit '44d628540c248f026bf2f26e8d9c3a17cb52b2b4'

* commit '44d628540c248f026bf2f26e8d9c3a17cb52b2b4':
  Replaced AlarmClock with DeskClock
2010-07-23 11:40:09 -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
Xavier Ducrohet c5ba93df51 Merge "Add SystemUi to the SDK build." 2010-07-22 18:36:53 -07:00
Xavier Ducrohet 2c6d410dac Add SystemUi to the SDK build.
Change-Id: I84eb98c0b3fdaeb9e06c934ea5f4bdcf078cb7f1
2010-07-22 18:31:10 -07:00
Ying Wang de3bbf0e61 am 3986feae: am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path
Merge commit '3986feae3266a86f0eb4d20fe97588868608b4c1'

* commit '3986feae3266a86f0eb4d20fe97588868608b4c1':
  Add JNI_H_INCLUDE as default header search path
2010-07-22 17:54:45 -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 87208510ab am 85581a1b: merge from open-source master
Merge commit '85581a1ba81105740cc1e87bfad040bbac4662ec'

* commit '85581a1ba81105740cc1e87bfad040bbac4662ec':
  Allow explicit warnings for projects
2010-07-22 11:35:13 -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 84a5ba03b4 am b96e8a8c: am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade'

* commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 11:24:38 -07:00
Ying Wang 1a631273eb am 163ce0f6: am ebf93bb5: am 75b28573: Fix sim build for unbundling native code
Merge commit '163ce0f62f7992d2c79257965919fcc1d975a6ec'

* commit '163ce0f62f7992d2c79257965919fcc1d975a6ec':
  Fix sim build for unbundling native code
2010-07-22 11:24:31 -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 e3feba8ba1 Merge "Fix native test static lib." 2010-07-21 17:11:26 -07:00
Ying Wang 475d8e9588 Fix native test static lib.
Change-Id: I2ef5a4c913732a9a3211556493926f4883b4160e
2010-07-21 16:18:21 -07:00
Ying Wang 38d7f02c50 Trim spaces.
Change-Id: Ic3c592ca9457748acf7f2c5e99dccd3ed62f5ee4
2010-07-21 14:58:42 -07:00
Jing Yu 584f5b7a84 Group needed libraries together to solve the cyclic dependence
between libc, libc_nomalloc and libgcc. When building with upcoming
arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a
and defined by libc.a or libc_nomalloc.a.which.

This patch groups libgc.a, libc_nomalloc.a and libgcc.a together, which is
a minimal group to solve this problem.

Change-Id: I27ed78c495dc53c1db7b302da8704f5e478ad893
2010-07-21 14:57:59 -07:00