summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-08-30Merge "Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency"android-sdk-support_r11android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-cts-4.2_r2android-cts-4.2_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22.2tools_r22tools_r21kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devJean-Baptiste Queru
2012-08-30Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependencyH.J. Lu
This fixes issue 36888. After commit 6d3fad1d908f3e2eb3334be88c17d5a497ef3f96 Author: Iliyan Malchev <malchev@google.com> Date: Tue Apr 10 15:10:21 2012 -0700 vbox_x86: use cache.img Change-Id: I3498af8258adbb88ccd26c3c101842567cc28364 Signed-off-by: Iliyan Malchev <malchev@google.com> $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) depends on $(INSTALLED_CACHEIMAGE_TARGET). But its dependency is missing. This patch adds $(INSTALLED_CACHEIMAGE_TARGET) dependency to $(INSTALLED_ANDROID_IMAGE_DATA_TARGET). Change-Id: I51af28c08b3b3f7b4510905d2ae521e596dc4521
2012-08-16Merge "host modules don't need LOCAL_MODULE_TAGS"Joe Onorato
2012-06-13host modules don't need LOCAL_MODULE_TAGSJoe Onorato
Change-Id: Iaf5f46ab3a1cfce49568782fbc435d2585f7688e
2012-04-10vbox_x86 builds: force-set the vdi UUIDsandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releasejb-devIliyan Malchev
The VDI UUID is used by VirtualBox to make sure that a disk is not in use by more than one VM at a time. This is a nuisance when you have to rebuild the image constantly, as you have to manually release and re-add the VDI with a new UUID each time before you run the VM. So for now, set the UUID to all As for /dev/sda and all Bs for /dev/sdb to make life easier. Change-Id: I3e36331c25b6f47c2d466556f906b4a11ef53e74 Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-10vbox_x86: use cache.imgIliyan Malchev
Change-Id: I3498af8258adbb88ccd26c3c101842567cc28364 Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-05vbox_x86: have separate system and data disksIliyan Malchev
The boot, recovery, and system partitions are now mounted from /dev/sda, while userdata and cache are mounted from /dev/sdb. To this end, we have two new build targets, in addition to android_disk_vdi: make android_system_disk_vdi will build /dev/sda make android_user_disk_vdi will build /dev/sdb android_disk_vdi will build both disks. Change-Id: I7389194429d42eca4800c5bb41d32099b7eeafa1 Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-05editdisklbl: remove stale include-file referenceIliyan Malchev
libdiskconfig moved out to system/core a long time ago; it's header is now automatically available and does not need a LOCAL_C_INCLUDES in Android.mk. Change-Id: I8fb8b93155e63740f5b849ae903df36e0fcd8ab2 Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-01-08Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ib15b86223509a68d44662d1ae88af1297d4e1cdb
2012-01-05Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I7a353a7ae185655e16b6d87a6a13b6ed359a89c9
2012-01-04Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I984187e0d999aa1504d47559b668d14fa03e3a98
2011-07-11Remove the simulator target from all makefiles.android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseJeff Brown
Bug: 5010576 Change-Id: I2124aaf8df37e0bd9957de6d4cb00b828aa8f11a
2011-03-04Merge "vbox: add a ready-to-boot android_disk_vdi target"android-sdk-tools_r12android-sdk-adt_r12David Turner
2011-03-04vbox: add a ready-to-boot android_disk_vdi targetBruce Beare
Change-Id: I517d2cf9b324caeee7c15d28eb1e9bf3083a3bc2 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-29Merge "Add ext4 support"Jean-Baptiste Queru
2010-12-29Add ext4 supportBruce Beare
Change-Id: I87540a3204d1272eadaea58d3ac97eb0b98728ed Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-29Merge "Add ueventd service for diskinstaller init.rc"Jean-Baptiste Queru
2010-12-29Add ueventd service for diskinstaller init.rcBruce Beare
Change-Id: I10d75b46c6bc0028c257380427b178132562a646 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-29Merge "Add missing LOCAL_MODULE_TAGS defn"Jean-Baptiste Queru
2010-12-27Add missing LOCAL_MODULE_TAGS defnBruce Beare
Change-Id: Iee5038677076ccef0b02b7c8dc32e912a0cbc8f2 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-15am 91f6fb6c: Merge "Make the /system/bin/sh link so installer.c works."Jean-Baptiste Queru
* commit '91f6fb6ce8ba4c19a1268a9ecc244ad38875720c': Make the /system/bin/sh link so installer.c works.
2010-12-15Merge "Make the /system/bin/sh link so installer.c works."tools_r9tools_r8froyo-plus-aospJean-Baptiste Queru
2010-10-11Make the /system/bin/sh link so installer.c works.Bruce Beare
The recent change to system/core/sh (bdc36d6) broke installer.c. This is easily fixed by restoring /system/bin/sh as a symlink to ash. Change-Id: Ie401adc4403faec0254169f9453aaf8bcbb37820 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-09merge from open-source masterThe Android Open Source Project
Change-Id: I92f883cfb85aa01ca0b857bce19c444fd239dbfa
2010-07-09diskconfig library has changed location. Fix include pathsandroid-sdk-tools_r7android-adt-0.9.9android-adt-0.9.8tools_r7Bruce Beare
Change-Id: Ibe61b046976728e3139135ee95c614132a2e02e2 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-07merge from open-source masterThe Android Open Source Project
Change-Id: Ie7b46de270df88e7dbf9eb92a45e1ff7a315b1d0
2010-07-02Delete the libdiskconfig sub directoryBruce Beare
There's another copy in build/system/core. Change-Id: I52e19eaaf9e818b90a9a47ba02400b35e245dcc4 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-02Change systembuilder tag to optionalBruce Beare
Change-Id: I78043cb1546fe81234b0b6d88d85a1e7ca3857ce Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-05-10merge from open-source masterandroid-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbreadThe Android Open Source Project
Change-Id: I28be55e2d649c8d52ad7ed47c5a19221a886ae7b
2010-05-07Merge "Target to generate VirtualBox image"Jean-Baptiste Queru
2010-05-07Target to generate VirtualBox imageBruce Beare
The kernel command line can be different when using the disk installer. This allows the console to go to the screen for the disk installer while still going to the serial port for normal boots. Remove a check for VBoxMange being installed. Adds some somewhat more clear instructions on completion or failure. Change-Id: Ic221d6c75b3109b2ec95a6c6a650c008f1dfef87
2010-03-26Enable verbose optionBruce Beare
Change-Id: I1b5bc04ad37c26ae0563b9402d175c9700c9e568
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1froyo-releasefroyoJean-Baptiste Queru
Change-Id: I205ae2345c2285896431abf26f36b4fa2511150a
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-04-22Merge donut into masterandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releasedonut-plus-aospJean-Baptiste Queru
2009-03-29Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project
2009-03-18Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru
2009-03-03auto import from //depot/cupcake/@135843android-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1android-1.5r4android-1.5r3android-1.5r2android-1.5donut-release2donut-releasedonutcupcake-releasecupcakeThe Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-02-10auto import from //branches/cupcake/...@130745The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 20:41:55 +0000