Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Fix build: Revert "Add verity support to `make dist`."" | Ed Heyl | 2014-05-09 | 1 | -1/+0 |
|\ | |||||
| * | Fix build: Revert "Add verity support to `make dist`." | Ed Heyl | 2014-05-09 | 1 | -1/+0 |
* | | am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus... | Xavier Ducrohet | 2014-05-09 | 1 | -15/+1 |
|\ \ | |||||
| * \ | Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp | Xavier Ducrohet | 2014-05-08 | 1 | -15/+1 |
| |\ \ | |||||
| | * \ | am afe444a5: Merge "Remove SDK Tools from platform builds." | Xavier Ducrohet | 2014-05-09 | 1 | -15/+1 |
| | |\ \ | |||||
| | | * | | Remove SDK Tools from platform builds. | Xavier Ducrohet | 2014-05-08 | 1 | -15/+1 |
* | | | | | Merge "Add verity support to `make dist`." | Geremy Condra | 2014-05-09 | 1 | -0/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Add verity support to `make dist`. | Geremy Condra | 2014-05-06 | 1 | -0/+1 |
* | | | | | Remove hardcoded TARGET_PREFER_32_BIT_APPS. | Narayan Kamath | 2014-05-08 | 1 | -6/+0 |
|/ / / / | |||||
* | | | | am 40aabbee: am 9150a90d: am 5128237a: Merge "build: set TARGET_SUPPORTS_64_B... | Colin Cross | 2014-05-05 | 1 | -3/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 9150a90d: am 5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64... | Colin Cross | 2014-05-05 | 1 | -3/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | am 5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config" | Colin Cross | 2014-05-05 | 1 | -3/+2 |
| | |\ \ | | | |/ | |||||
| | | * | build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config | Colin Cross | 2014-05-05 | 1 | -3/+2 |
* | | | | Merge "Add libmediandk" | Marco Nelissen | 2014-05-05 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Add libmediandk | Marco Nelissen | 2014-04-21 | 1 | -0/+1 |
* | | | | | am 6f916664: am 735628e8: am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2... | Colin Cross | 2014-05-05 | 4 | -3/+43 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am 735628e8: am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6 | Colin Cross | 2014-05-05 | 4 | -3/+43 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6 | Colin Cross | 2014-05-05 | 4 | -3/+43 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | build: add core_64_bit.mk | Colin Cross | 2014-05-01 | 4 | -3/+43 |
| | * | | | Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD | Bill Yi | 2014-04-29 | 1 | -1/+2 |
| | |\ \ \ | |||||
| | | * \ \ | am 9ce34617: am 4f9d6f57: Merge "Fix embedded build" | Ying Wang | 2014-03-20 | 2 | -1/+1 |
| | | |\ \ \ | |||||
| | | * \ \ \ | am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk." | Victoria Lease | 2014-03-11 | 2 | -0/+6 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | am 4c65c202: am 7fc3a06d: Merge "build: add logd" | Mark Salyzyn | 2014-03-11 | 1 | -0/+1 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | am f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install." | Stephen Hines | 2014-03-07 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | am 2fbe5018: Merge "add linker64 and debuggerd64 to all products" | Colin Cross | 2014-03-07 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | am f10efbc1: Merge "make 64-bit builds into multiarch builds" | Colin Cross | 2014-03-07 | 3 | -0/+6 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | am bec954d0: Merge "Clean up dangling module names" | Ying Wang | 2014-03-07 | 1 | -7/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | am ba46260f: Merge "Runtime resource overlay, iteration 2" | Ying Wang | 2014-03-07 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | am 145562fc: Merge "Add missing font files to SDK system images." | David 'Digit' Turner | 2014-03-07 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | am efb9603a: Merge "[MIPS64] Add mips64 target" | Elliott Hughes | 2014-03-07 | 3 | -1/+52 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | \ \ \ \ \ \ \ \ \ \ \ \ | am 007f8c80: am 0e35df2a: Add ContactsProvider to core_tiny. | Justin Koh | 2014-05-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am 0e35df2a: Add ContactsProvider to core_tiny. | Justin Koh | 2014-05-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Add ContactsProvider to core_tiny. | Justin Koh | 2014-05-04 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | Merge "verity: clean up verity build dependencies" | Colin Cross | 2014-04-30 | 1 | -6/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | verity: clean up verity build dependencies | Colin Cross | 2014-04-28 | 1 | -6/+0 |
* | | | | | | | | | | | | | | | | | | Add SDK product for arm64, x86_64 and mips64. | Ying Wang | 2014-04-29 | 4 | -1/+88 |
|/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | resolved conflicts for merge of 0a694f4c to master | Ying Wang | 2014-04-25 | 2 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | am c564b691: Remove libs from target/product/base.mk. | Ying Wang | 2014-04-25 | 2 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Remove libs from target/product/base.mk. | Ying Wang | 2014-04-24 | 2 | -2/+1 |
* | | | | | | | | | | | | | | | | | Merge "Remove VideoEditor" | Lajos Molnar | 2014-04-22 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Remove VideoEditor | Lajos Molnar | 2014-04-22 | 1 | -1/+0 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | resolved conflicts for merge of 77efd7b4 to master | Ian Rogers | 2014-04-22 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am f1d5dcdd: am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulat... | Ian Rogers | 2014-04-22 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator." | Ian Rogers | 2014-04-22 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Make the zygote 64-bit for the x86-64 emulator. | Ian Rogers | 2014-04-18 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | | am 25e75aba: am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non... | Ying Wang | 2014-04-15 | 4 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator bui... | Ying Wang | 2014-04-15 | 4 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove s... | Ying Wang | 2014-04-15 | 4 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK... | Ying Wang | 2014-04-15 | 4 | -3/+3 |
| | | * | | | | | | | | | | | | | Merge "DO NOT MERGE: Combine emulator test projects into a single apk" | Steve Moyer | 2014-04-04 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / |