summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Drop the [no]proguard. prefix for the intermediate targetsYing Wang2013-09-121-17/+1
| | | | | | | | | | Since we have enabled Progaurd for all build variants, we don't need the different naming scheme along the path to make incremental build work properly when you switch build variant. As a result, this fixes the nothing-to-do-do-build-gets-something-build bug introduced by the multi-dex change. Change-Id: I907ff13091013d28910b0aa190b9218144385132
* am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib ↵Scott Main2013-09-121-0/+1
|\ | | | | | | | | | | | | from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev * commit '7cba6168c3cf7681e6200f78bfbf8deacc2f735c': Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
| * am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ↵Scott Main2013-09-121-0/+1
| |\ | | | | | | | | | | | | | | | | | | ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev * commit '9a3fb8711f93751ba3e709f4e99691147e6c2c93': Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
| | * Merge "Revert "remove renderscript support lib from javadocs" ... put ↵Scott Main2013-09-121-0/+1
| | |\ | | | | | | | | | | | | support lib javadocs for renderscript back in." into jb-mr2-ub-dev
| | | * Revert "remove renderscript support lib from javadocs"Scott Main2013-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... put support lib javadocs for renderscript back in. This reverts commit 5b743677eb4bb91af98b005651370885bdaae3e5. Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
* | | | Remove libchromium_net from the base product.Torne (Richard Coles)2013-09-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Chromium network stack is only needed by libwebcore and stagefright, both of which already explicitly depend on it, so there's no need for it to be in the base package list. Bug: 10427705 Change-Id: Ifbb089de867c577788c6310571337c39c4ce31e0
* | | | include external/sil-fontsVictoria Lease2013-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 10625246 Change-Id: I15c655030557e91663635b70848da86c9e0221e7 (cherry picked from commit fd1327256e698a7b5dd677bea45947fd20b23208)
* | | | am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on ↵Scott Main2013-09-111-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | handsets. set device-width for viewport tag * commit '0c2b69d5b82062ecdef39297ddc7f7d86d038ad8': fix most of size problems of DAC on handsets. set device-width for viewport tag
| * | | am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set ↵Scott Main2013-09-111-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | device-width for viewport tag * commit 'd6125b5e2ff71988009bc0fd86a32876e9a6981f': fix most of size problems of DAC on handsets. set device-width for viewport tag
| | * | am 2552239a: fix most of size problems of DAC on handsets. set device-width ↵Scott Main2013-09-111-1/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for viewport tag * commit '2552239a522963429f494ff89a4be6d3831fb1fb': fix most of size problems of DAC on handsets. set device-width for viewport tag
| | | * | fix most of size problems of DAC on handsets.Scott Main2013-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set device-width for viewport tag Change-Id: I87854bfac990d277ba95cc7bcf37799c7f36a0ee
* | | | | Merge "Update OTA to understand SELinux labels and capabilities" into klp-devNick Kralevich2013-09-105-53/+172
|\ \ \ \ \
| * | | | | Update OTA to understand SELinux labels and capabilitiesNick Kralevich2013-09-105-53/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the OTA generation script to understand SELinux file labels and file capabilities. Make fs_config aware of SELinux labels and file capabilities, and optionally output those elements whenever we output the UID / GID / file perms. The information is emitted as a key=value pair to allow for future extensibility. Pass the SELinux file label and capabilities to the newly created set_metadata() and set_metadata_recursive() calls. When the OTA script fixes up filesystem permissions, it will also fix up the SELinux labels and file capabilities. If no SELinux label and capabilities are available for the file, use the old set_perm and set_perm_recursive calls. Bug: 8985290 Bug: 10183961 Bug: 10186213 Change-Id: I4fcfb2c234dbfb965cee9e62f060092a4274d22d
* | | | | | Load the ONE_SHOT_MAKEFILE even in dont_bother modeYing Wang2013-09-091-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes "mmm <path> snod" work again. Note that snod has dependency on the rest of the command line goals, which is all_modules for ONE_SHOT_MAKEFILE, so build race condition is avoided. Change-Id: Ib0c0e622530cde773180a095e5ec4dde1149b8e5
* | | | | | Delete dead code.Ying Wang2013-09-091-10/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/policies/base/PolicyConfig.mk does no longer exist. Change-Id: I34d4820bc7c1e19ac84095f5f2caf6aefdfe1bd3
* | | | | am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from ↵Dirk Dougherty2013-09-061-1/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | parentdirs keys, optionally linkify." into jb-mr2-docs * commit '0b345f589691a774d04a698e80412c531c726f6c': Build file breadcrumb from parentdirs keys, optionally linkify.
| * | | | am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, ↵Dirk Dougherty2013-09-061-1/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | optionally linkify." into jb-mr2-docs * commit '471f0cc84adbb666e4d0e2529feb326df6d3baa3': Build file breadcrumb from parentdirs keys, optionally linkify.
| | * | | am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally ↵Dirk Dougherty2013-09-061-1/+10
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | linkify." into jb-mr2-docs * commit '243ffc5bc2f26041b440ad107c1725913c73765a': Build file breadcrumb from parentdirs keys, optionally linkify.
| | | * | Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into ↵Dirk Dougherty2013-09-061-1/+10
| | | |\ \ | | | | | | | | | | | | | | | | | | jb-mr2-docs
| | | | * | Build file breadcrumb from parentdirs keys, optionally linkify.Dirk Dougherty2013-09-051-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f4c9887d77c6d3ab1aca4e05963b6144a8b22f8
* | | | | | Merge "add libeffectproxy for audio effects offloading" into klp-devEric Laurent2013-09-061-0/+1
|\ \ \ \ \ \
| * | | | | | add libeffectproxy for audio effects offloadingEric Laurent2013-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libeffectproxy is used when offloading audio effects to a DSP. It is a framework component working with the audio effects factory in libeffects that must be present on all products. Bug: 8174034. Change-Id: I5035884735a370e9fe87467a45efbf24ba190886
* | | | | | | am 76ff86cd: am 5d9690e3: am 4a9cc386: remove prev/next links from API guidesScott Main2013-09-051-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '76ff86cd32927899cd6a2913d4eeb920806d0ae6': remove prev/next links from API guides
| * | | | | | am 5d9690e3: am 4a9cc386: remove prev/next links from API guidesScott Main2013-09-051-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '5d9690e376b27ede23c5f8b45e8689ffe30ef290': remove prev/next links from API guides
| | * | | | | am 4a9cc386: remove prev/next links from API guidesScott Main2013-09-051-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '4a9cc3864a4fcb80522805bbef5052ff914311e3': remove prev/next links from API guides
| | | * | | | remove prev/next links from API guidesScott Main2013-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic80ec436a6ee1c7decc3a6fc8905f52a1b50ea6a
* | | | | | | Add libcore.conscrypt tests back to CTSKenny Root2013-09-051-2/+12
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A reorganization of the libcore test jar files caused the Conscrypt tests to be accidentally dropped from CTS. Add them back in their own package. Bug: 10210673 Change-Id: Ia46a5de925c35115d25b7c0f974eba5b27bbfcd6
* | | | | | am 07540873: am eb23299b: am 0ad622b4: add ellipsis for overflowing strings ↵Scott Main2013-09-041-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in samples nav * commit '07540873614ac13d1352ab30e25ea8f1aabc4035': add ellipsis for overflowing strings in samples nav
| * | | | | am eb23299b: am 0ad622b4: add ellipsis for overflowing strings in samples navScott Main2013-09-041-0/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'eb23299bd55853135ebf3f8a99a0d0bcf1364b0a': add ellipsis for overflowing strings in samples nav
| | * | | | am 0ad622b4: add ellipsis for overflowing strings in samples navScott Main2013-09-041-0/+6
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '0ad622b4a6fcaa4232b543aba3e28ec982b50d08': add ellipsis for overflowing strings in samples nav
| | | * | | add ellipsis for overflowing strings in samples navScott Main2013-09-041-0/+6
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I1efcba409b068be0616eb2e3d80fadda301fd5f6
* | | | | Combining InCallUI & Dialer (part 2)Santos Cordon2013-09-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing InCallUI from generic product. InCallUI code was built into Dialer so this APK is now redundant bug:10605332 Change-Id: Icfaf0b1975f2d6749c837f42ee309e17c9d08e23
* | | | | am 70892395: am d55fb681: am 6fb7e23b: Add file path above h1 in samplecode ↵Dirk Dougherty2013-09-032-13/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | files. * commit '70892395bb48ffca762a47c9bb35c1ad9c3512dc': Add file path above h1 in samplecode files.
| * | | | am d55fb681: am 6fb7e23b: Add file path above h1 in samplecode files.Dirk Dougherty2013-09-032-13/+18
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd55fb681d6766369e2dec734e22534fd43d9cc70': Add file path above h1 in samplecode files.
| | * | | am 6fb7e23b: Add file path above h1 in samplecode files.Dirk Dougherty2013-09-032-13/+18
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '6fb7e23bbaf07c5b89e885656d15efea07c527dc': Add file path above h1 in samplecode files.
| | | * | Add file path above h1 in samplecode files.Dirk Dougherty2013-08-302-13/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I91adb197b478ea476bbf0e07650486581c1ca8ec
* | | | | Merge "Fix handling of .o files in LOCAL_GENERATED_SOURCES." into klp-devTorne (Richard Coles)2013-08-301-6/+10
|\ \ \ \ \
| * | | | | Fix handling of .o files in LOCAL_GENERATED_SOURCES.Torne (Richard Coles)2013-08-291-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rule-generated .o files (in gen_o_objects) were being given a dependency on everything in LOCAL_GENERATED_SOURCES (except for other .o files); unfortunately this can still create cycles in cases where there are explicit dependencies between entries in LOCAL_GENERATED_SOURCES. Instead, make handling of generated .o files consistent with other generated files (which don't automatically get any dependencies on other generated files) by excluding them from the target side of the rule. Change-Id: I3fb5652dc3d85012c179a03b81887d16a85ab3bf
* | | | | | Remove Moto OMA DM client from build tree.Jake Hamby2013-08-291-0/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Moto OMA DM client from system image and intermediates. Bug: 10455884 Change-Id: Idc0529d33911dc417f8f5b6db71808bf847eed3c
* | | | | am cbea143e: am 019891c1: am fc9cd4f5: Create an empty zip file if no dict ↵Ying Wang2013-08-280-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | file found. * commit 'cbea143e94409ef941bbfb6c276d26199da46119': Create an empty zip file if no dict file found.
| * | | | am 019891c1: am fc9cd4f5: Create an empty zip file if no dict file found.Ying Wang2013-08-281-2/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '019891c1b858e571edd748e884b18d22d8efd10a': Create an empty zip file if no dict file found.
| | * | | am fc9cd4f5: Create an empty zip file if no dict file found.Ying Wang2013-08-281-2/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc9cd4f5c17eb51f09bb3fe14526894c7fa33ba6': Create an empty zip file if no dict file found.
| | | * | | Create an empty zip file if no dict file found.Ying Wang2013-08-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of touch an empty file. Change-Id: Ifa8bb04cea6fc0fc3165337f6815d5976bac677d (cherry picked from commit c62c92c3d737304cbd38e99e92f29e193b15b7c8)
* | | | | | Create an empty zip file if no dict file found.Ying Wang2013-08-281-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of touch an empty file. Change-Id: Ifa8bb04cea6fc0fc3165337f6815d5976bac677d
* | | | | | Skip compiling Java if an apk has no Java code.Ying Wang2013-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee204e03ad5bc8ce5c3b4b3863c19c89184826e2
* | | | | | Better handle of need_compile_java.Ying Wang2013-08-284-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
* | | | | | Make it a fatal error if no source files for Java module.Ying Wang2013-08-285-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia04158c11381b6b1687b9d5c699a9ea8ae3cb317
* | | | | | Merge "Docs: Fixing link from logo in PDK Bug: 9177537 Staging location: ↵Clay Murphy2013-08-281-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | http://claym.mtv.corp.google.com:8083/guide/getting_started.html" into klp-dev
| * | | | | | Docs: Fixing link from logo in PDKClay Murphy2013-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9177537 Staging location: http://claym.mtv.corp.google.com:8083/guide/getting_started.html Change-Id: I4c4708a168688fdfc79468b955115d7f37df1bc2
* | | | | | | Merge "fix uses of grep in envsetup.h" into klp-devMathias Agopian2013-08-271-3/+3
|\ \ \ \ \ \ \