summaryrefslogtreecommitdiffstats
path: root/target
Commit message (Collapse)AuthorAgeFilesLines
* Merge "verity: clean up verity build dependencies"Colin Cross2014-04-301-6/+0
|\
| * verity: clean up verity build dependenciesColin Cross2014-04-281-6/+0
| | | | | | | | | | | | | | | | | | | | Move image dependencies out of PRODUCT_PACKAGES and into direct dependencies for the image building rules. Fix the test for PRODUCT_SUPPORTS_VERITY, it needs to check for the current project as the global is no longer set. Change-Id: I811501834ae5ec658229bd505fcc48275ff578c9
* | Add SDK product for arm64, x86_64 and mips64.Ying Wang2014-04-294-1/+88
|/ | | | | Bug: 14411602 Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
* resolved conflicts for merge of 0a694f4c to masterYing Wang2014-04-252-2/+1
|\ | | | | | | Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
| * am c564b691: Remove libs from target/product/base.mk.Ying Wang2014-04-252-2/+1
| |\ | | | | | | | | | | | | * commit 'c564b691d55d4dcede7ce46248b1a87acf3d2618': Remove libs from target/product/base.mk.
| | * Remove libs from target/product/base.mk.Ying Wang2014-04-242-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | LatinIME has libjni_latinime as dependency, so we don't need it in PRODUCT_PACKAGES; Moved libpac close to PacProcesser, which requires libpac. Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
* | | Merge "Remove VideoEditor"Lajos Molnar2014-04-221-1/+0
|\ \ \
| * | | Remove VideoEditorLajos Molnar2014-04-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This app is no longer supported as there are 3rd party video editing apps, such as Google+ Video Editor. Bug: 13542518 Change-Id: Ib3a4e2e7d3e261e12355650fc4db62ac59daef8e
* | | | resolved conflicts for merge of 77efd7b4 to masterIan Rogers2014-04-222-1/+5
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
| * | am f1d5dcdd: am 850299f6: Merge "Make the zygote 64-bit for the x86-64 ↵Ian Rogers2014-04-222-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | emulator." * commit 'f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd': Make the zygote 64-bit for the x86-64 emulator.
| | * \ am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."Ian Rogers2014-04-222-1/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '850299f6a6a831d47af68a3004a62df21b5fee3a': Make the zygote 64-bit for the x86-64 emulator.
| | | * | Make the zygote 64-bit for the x86-64 emulator.Ian Rogers2014-04-182-1/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
* | | | | am 25e75aba: am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from ↵Ying Wang2014-04-154-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | non-emulator builds; Remove screenrecord from SDK build." * commit '25e75abac2c9229c0c4741e33f504a341a36ad94': Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
| * | | | am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator ↵Ying Wang2014-04-154-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | builds; Remove screenrecord from SDK build." * commit '6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65': Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
| | * | | am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove ↵Ying Wang2014-04-154-3/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | screenrecord from SDK build." * commit '0ac89b459542ef88a8c61f45f0d6b680f9931ddf': Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
| | | * | Remove libGLES_android from non-emulator builds; Remove screenrecord from ↵Ying Wang2014-04-154-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK build. Bug: 11368415 Bug: 14087863 Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
| | | * | Merge "DO NOT MERGE: Combine emulator test projects into a single apk"Steve Moyer2014-04-041-2/+2
| | | |\ \ | | |/ / /
| | | * | DO NOT MERGE: Combine emulator test projects into a single apkSteve Moyer2014-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests Conflicts: target/product/sdk.mk Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
* | | | | Merge "Add verity dev keys to build."Geremy Condra2014-04-043-1/+29
|\ \ \ \ \
| * | | | | Add verity dev keys to build.Geremy Condra2014-04-023-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will be used when making images from your dev machine. Change-Id: Ib1c894f6874a8e1a7d3d6e8133c8e897d40080d4
* | | | | | Add handheld_core_hardware.xml to telephony baseJi-Hwan Lee2014-04-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13683526 Change-Id: I8085fa1abfa460213c3c9fe2a63217ee16b9ff8a
* | | | | | am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator ↵Greg Hackmann2014-04-031-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | on x86_64"" * commit '0fd37501c4610783c53a6f8d4000ba7a230f61df': Revert "HACK: disable emulator on x86_64"
| * | | | | am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""Greg Hackmann2014-04-021-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd': Revert "HACK: disable emulator on x86_64"
| | * | | | Merge "Revert "HACK: disable emulator on x86_64""Greg Hackmann2014-04-021-2/+2
| | |\ \ \ \
| | | * | | | Revert "HACK: disable emulator on x86_64"Greg Hackmann2014-03-311-2/+2
| | | | |/ / | | | |/| | | | | | | | | | | | | | This reverts commit 4562c5bcb355c87a18e811ba8e6c2b6451a3ebf7.
* | | | | | am 0396b102: am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata ↵Colin Cross2014-04-021-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | image size" * commit '0396b10235ece43be797e48673ec05c4cf4c74d7': aosp_arm64: increase userdata image size
| * | | | am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size"Colin Cross2014-04-021-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '578f7ec487c2c00581cdc9807d0d24883ba4406a': aosp_arm64: increase userdata image size
| | * | | Merge "aosp_arm64: increase userdata image size"Colin Cross2014-04-021-1/+1
| | |\ \ \
| | | * | | aosp_arm64: increase userdata image sizeColin Cross2014-04-021-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase userdata image size to allow make tests to builds with extra tests to fit. Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
* | | | | am b6cc8421: am 2c9552b7: am aafbbe7e: Merge "Add a default value for ↵Narayan Kamath2014-04-011-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ro.zygote." * commit 'b6cc84212875fda1b8d2ccc0a66fc6a2169933d9': Add a default value for ro.zygote.
| * | | | am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote."Narayan Kamath2014-04-011-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2c9552b78486ae1592303932dc70e00ff487d76f': Add a default value for ro.zygote.
| | * | | Add a default value for ro.zygote.Narayan Kamath2014-03-311-0/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Also makes sure the correct init config file is copied across. Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
* | | | Merge "Add the verity key to the verity dependencies."Geremy Condra2014-03-261-1/+2
|\ \ \ \
| * | | | Add the verity key to the verity dependencies.Geremy Condra2014-03-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed this last time around. Needed to boot. Change-Id: I67f25ed442365ad0171ecbc37bc2de02b7108399
* | | | | Add wifi-service to PRODUCT_PACKAGES.Tim Kilbourn2014-03-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13622394 Change-Id: Ifa186db4b804bcb123b26324978c7a1ad986c1e2
* | | | | fix bad merge conflict resolutionColin Cross2014-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d
* | | | | resolved conflicts for merge of f8e4d1b7 to masterColin Cross2014-03-212-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94
| * | | | am 37f3c5cc: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUMMark Renouf2014-03-212-2/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '37f3c5cc1de11f7b316c2d03ed8f6951d4f95372': Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
| | * | | Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUMMark Renouf2014-03-212-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
* | | | | Merge "move libbcc from core_base to core_minimal"Adam Hampson2014-03-212-1/+1
|\ \ \ \ \
| * | | | | move libbcc from core_base to core_minimalAdam Hampson2014-03-212-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13528787 Change-Id: If8b531f71bf3831e4d3d59e2a2bc04dd72f4a8b1 Signed-off-by: Adam Hampson <ahampson@google.com>
* | | | | | Merge "stagefright: use media_codecs_google*.xml files"Lajos Molnar2014-03-218-0/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | stagefright: use media_codecs_google*.xml filesLajos Molnar2014-03-198-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13549114 Change-Id: I25d6344c78da152f394fa7b4855a2eb61008afc6
* | | | | | am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the ↵Ying Wang2014-03-203-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | redundant DISABLE_DEXPREOPT" * commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4': Remove the redundant DISABLE_DEXPREOPT
| * | | | | am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"Ying Wang2014-03-203-3/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37': Remove the redundant DISABLE_DEXPREOPT
| | * | | | Remove the redundant DISABLE_DEXPREOPTYing Wang2014-03-203-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To disable dexpreopt, use just: WITH_DEXPREOPT=false Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
* | | | | | resolved conflicts for merge of ad495272 to masterYing Wang2014-03-202-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
| * | | | am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"Ying Wang2014-03-202-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9ce34617a001338093b0de85443925a37a967f0d': Fix embedded build
| | * | | Fix embedded buildYing Wang2014-03-202-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product. 2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk, for it's only decided by target arch. 3) Move Java module input from embedded.mk to base.mk. Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
* | | | | am 77e63659: am cea2ad87: am e623b4c2: am f2fd6d9a: Merge "Allow shell ↵Nick Kralevich2014-03-195-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | serial_device read-write access" * commit '77e63659d3d7be6ea891b07ae5f84cee70a392fa': Allow shell serial_device read-write access
generated by cgit v1.1 at 2025-02-09 11:39:28 +0000