summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c2b74b87: am 57a3d3e1: Merge "Remove uses of density in ↵Adam Lesinski2014-12-044-26/+5
|\ | | | | | | | | | | | | PRODUCT_AAP_CONFIG" into lmp-mr1-dev * commit 'c2b74b87d4ea4bcdef228080a874bad4aca7c323': Remove uses of density in PRODUCT_AAP_CONFIG
| * am 57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into ↵Adam Lesinski2014-12-044-26/+5
| |\ | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '57a3d3e1f48f1719fdead0b13495230d772955b4': Remove uses of density in PRODUCT_AAP_CONFIG
| | * Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-devAdam Lesinski2014-12-034-26/+5
| | |\
| | | * Remove uses of density in PRODUCT_AAP_CONFIGAdam Lesinski2014-12-034-26/+5
| | | | | | | | | | | | | | | | Change-Id: I98594165515c07fa2e6b847266f7d8fa3283b52e
* | | | am ea4f39e8: Merge "Switch to Clang 3.6."Stephen Hines2014-12-041-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'ea4f39e86d315793390fb84b5b4d667aa4d3917b': Switch to Clang 3.6.
| * \ \ \ Merge "Switch to Clang 3.6."Stephen Hines2014-12-041-2/+8
| |\ \ \ \
| | * | | | Switch to Clang 3.6.Stephen Hines2014-12-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also defaults C compilations with clang to gnu99, and turns off the -Winconsistent-missing-override flag, since we need further cleanup to turn it on. -finline-functions is an unnecessary flag that only gcc needs. Change-Id: I1cfcaedca32d9e3c248a6aa9460603205901c491
* | | | | | am b919da4c: Merge "Rename core/combo/arch/x86/x86-atom.mk to ↵Elliott Hughes2014-12-041-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core/combo/arch/x86/atom.mk." * commit 'b919da4c6267cd139e8b3c41db921e1f61ad4c50': Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.
| * | | | | Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk."Elliott Hughes2014-12-031-0/+0
| |\ \ \ \ \
| | * | | | | Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.Alexander Ivchenko2014-12-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise wrong set of memory/string functions is chosen when building atom image (in Bionic we have libc/arch-x86/atom/atom.mk). Plus this naming is consistent with other x86 architectures. Change-Id: I21e899534e7ce10530474a22ceba770422b39d8d Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
* | | | | | | am b8e8e522: am e217fc3c: am eee91eb2: am d99989c5: Merge "new version of ↵smain@google.com2014-12-032-20/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helpouts recruit banner for TV and Wear" into lmp-docs * commit 'b8e8e522704f37ea5adc63cce9c34801bb10c42d': new version of Helpouts recruit banner for TV and Wear
| * | | | | | am e217fc3c: am eee91eb2: am d99989c5: Merge "new version of Helpouts ↵smain@google.com2014-12-032-20/+7
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recruit banner for TV and Wear" into lmp-docs * commit 'e217fc3c3ee9a437dfdeda2c3cc0df99380dbfc0': new version of Helpouts recruit banner for TV and Wear
| | * | | | | am eee91eb2: am d99989c5: Merge "new version of Helpouts recruit banner for ↵smain@google.com2014-12-032-20/+7
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TV and Wear" into lmp-docs * commit 'eee91eb24233fa0a14f2d273bebd18a4bcb87310': new version of Helpouts recruit banner for TV and Wear
| | | * | | | am d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" ↵smain@google.com2014-12-032-20/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit 'd99989c558c384312bd63cf3a5e1bbbd799bf4b5': new version of Helpouts recruit banner for TV and Wear
| | | | * \ \ \ Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docssmain@google.com2014-12-032-20/+7
| | | | |\ \ \ \
| | | | | * | | | new version of Helpouts recruit banner for TV and Wearsmain@google.com2014-12-022-20/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I971e9043b60bdb925c2f648e0aff3de9d8c9cd81
* | | | | | | | | am 0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef."Stephen Hines2014-12-021-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '0db9ea923309f514a3216826593b325cffcfbbbf': Fix a preprocessor warning exposed by -Wundef.
| * | | | | | | | Merge "Fix a preprocessor warning exposed by -Wundef."Stephen Hines2014-12-021-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix a preprocessor warning exposed by -Wundef.Stephen Hines2014-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18589470 __LP64__ is only defined for 64-bit compilation targets, so this macro is evaluated as an implicit 0 in the original case. This change makes it explicit that we only care whether this is actually defined. Change-Id: I8c11b41fc0bde9477c5efeea0782d9741d9d827d
* | | | | | | | | | am b60408bb: am 8070b20f: Support to build dpi-specific apk variants.Ying Wang2014-12-022-0/+80
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b60408bb53a4a63cd186c5bedfded90856b60d73': Support to build dpi-specific apk variants.
| * | | | | | | | | am 8070b20f: Support to build dpi-specific apk variants.Ying Wang2014-12-022-0/+80
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8070b20f9ec899a5dc27c7589f11c6db8c72180a': Support to build dpi-specific apk variants.
| | * | | | | | | | Support to build dpi-specific apk variants.Ying Wang2014-12-022-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In unbundled apps_only build, in addition to the base apk, you can also build the dpi-specific apk variants, with: LOCAL_DPI_VARIANTS := <a list of dpi names> Previously user needs to include $(BUILD_PACKAGE) repeatedly with the same package definition except dpi flags. With this change, all the dpi-specific apk variants share the base apk's compiled Java code and only diverge at the point we add resources/assets to the apk. Also we set up variables/targets/rules in a way those dpi-specific apks appear to be independent apks to the users, for example, you can pass "AppName_<dpi_name>" to tapas, and AppName_<dpi_name>.apk lives in its own intermediate directory. Bug: 18388705 Change-Id: I2ba4972ea7d1f796352fab2407888f996781ae44
* | | | | | | | | | am 7e7fc27c: Merge "Remove unused BUILD_RAW_EXECUTABLE and ↵Elliott Hughes2014-12-023-31/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD_RAW_STATIC_LIBRARY." * commit '7e7fc27cbc7208598473e875e8bee3e3dfeb6ff9': Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
| * | | | | | | | | Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY."Elliott Hughes2014-12-023-31/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.Elliott Hughes2014-12-013-31/+0
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ba79197f3b9bb446ab34612bac8eb9485438709
* | | | | | | | | | am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."Stephen Hines2014-12-0212-1/+88
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4bad2d2156bcb589c2d1bb223a074edc39aa428c': Add more support for GLOBAL_CONLYFLAGS.
| * | | | | | | | | Merge "Add more support for GLOBAL_CONLYFLAGS."Stephen Hines2014-12-0212-1/+88
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Add more support for GLOBAL_CONLYFLAGS.Stephen Hines2014-12-0112-1/+88
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be necessary to support -std=gnu99 mode for clang 3.6, which defaults to C11 mode (unlike prior releases that use C99). Change-Id: Iea84582f9f12ba76b988463cbc0a20bd61042538
* | | | | | | | | am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."Ying Wang2014-12-021-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ded6640d970d83cb18ce2585565c11799064f5e0': Don't set up the prebuilt apk rule twice.
| * | | | | | | | Merge "Don't set up the prebuilt apk rule twice."Ying Wang2014-12-021-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Don't set up the prebuilt apk rule twice.Ying Wang2014-12-011-0/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For apps, we don't want to set up the prebuilt apk rule twice even if "LOCAL_MULTILIB := both", which for apps really means to set up only the jni library rules twice. See also build/core/install_jni_libs.mk. Change-Id: Id0406c3c605c6ede613dba06178a1710590c09b3
* | | | | | | | am bcca18bf: am 43fbdb2a: am dc8a05ca: am 570c2210: add support for ↵smain@google.com2014-12-011-1/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shadowbox videos with start time specified with #t= in video url * commit 'bcca18bfd87543ff8e21d9c892b3ac31bd8de82d': add support for shadowbox videos with start time specified with #t= in video url
| * | | | | | | am 43fbdb2a: am dc8a05ca: am 570c2210: add support for shadowbox videos with ↵smain@google.com2014-11-271-1/+7
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start time specified with #t= in video url * commit '43fbdb2acb8e4e673d963630acbc32ab2717139c': add support for shadowbox videos with start time specified with #t= in video url
| | * | | | | | am dc8a05ca: am 570c2210: add support for shadowbox videos with start time ↵smain@google.com2014-11-271-1/+7
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified with #t= in video url * commit 'dc8a05ca6922642851f93889f90052765a8a2fb6': add support for shadowbox videos with start time specified with #t= in video url
| | | * | | | | am 570c2210: add support for shadowbox videos with start time specified with ↵smain@google.com2014-11-261-1/+7
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #t= in video url * commit '570c2210b8ea16cc560e6b62ec06f8ad05fae9aa': add support for shadowbox videos with start time specified with #t= in video url
| | | | * | | | add support for shadowbox videos with start time specified with #t= in video urlsmain@google.com2014-11-251-1/+7
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Change-Id: I165620326f44f8e95bb34a2b623e67fc3b7dcc50
* | | | | | | am 7dcbc563: Merge "Fix a typo in my_cppflags assignment."Dan Albert2014-12-011-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | * commit '7dcbc563f8811259809b754d0c0edc717e1476e6': Fix a typo in my_cppflags assignment.
| * | | | | | Merge "Fix a typo in my_cppflags assignment."Dan Albert2014-12-011-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix a typo in my_cppflags assignment.Dan Albert2014-11-281-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make strikes once again... Change-Id: I295b4157fc7566b1a2cb925b06918dc0a96a7bce
* | | | | | am 78860124: am d020c517: am 39343e30: am ccb54008: rev css version to clear ↵smain@google.com2014-11-261-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | browser caches * commit '788601245a41067f7f300357925ac7f2d92e86b2': rev css version to clear browser caches
| * | | | | am d020c517: am 39343e30: am ccb54008: rev css version to clear browser cachessmain@google.com2014-11-261-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'd020c51752611b8b647db9dad94519e5514fc66f': rev css version to clear browser caches
| | * | | | am 39343e30: am ccb54008: rev css version to clear browser cachessmain@google.com2014-11-261-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '39343e30796d4fbf3d6daa5869acdb71a9fb3a87': rev css version to clear browser caches
| | | * | | am ccb54008: rev css version to clear browser cachessmain@google.com2014-11-261-1/+1
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | * commit 'ccb540081ca5f1c69bb1b2721cab319b88f9dd94': rev css version to clear browser caches
| | | | * | rev css version to clear browser cachessmain@google.com2014-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I46e04a02a0c010777ba01af28044999a1cbe1e10
* | | | | | am 42abb5fc: am 17874347: am b90e4792: am 3a9d50e1: move the next/previous ↵smain@google.com2014-11-261-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | links in design docs up 25px to avoid overlap with long titles * commit '42abb5fc564e2735dff568d1833e23507e485564': move the next/previous links in design docs up 25px to avoid overlap with long titles
| * | | | | am 17874347: am b90e4792: am 3a9d50e1: move the next/previous links in ↵smain@google.com2014-11-261-0/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | design docs up 25px to avoid overlap with long titles * commit '17874347cc72e88bb318057bca01d36a47dfc5e4': move the next/previous links in design docs up 25px to avoid overlap with long titles
| | * | | | am b90e4792: am 3a9d50e1: move the next/previous links in design docs up ↵smain@google.com2014-11-261-0/+3
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25px to avoid overlap with long titles * commit 'b90e4792dea4271395e216a9d37c712572395003': move the next/previous links in design docs up 25px to avoid overlap with long titles
| | | * | | am 3a9d50e1: move the next/previous links in design docs up 25px to avoid ↵smain@google.com2014-11-261-0/+3
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overlap with long titles * commit '3a9d50e19d9789cffc0d3d398733d909ee2ee618': move the next/previous links in design docs up 25px to avoid overlap with long titles
| | | | * | move the next/previous links in design docs up 25px to avoid overlap with ↵smain@google.com2014-11-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long titles Change-Id: I3428e4cf2959d0e171692d12d47e100b46b6733e
* | | | | | am bceaa7f1: am 35e7c067: Add Lohit fonts to the build.Roozbeh Pournader2014-11-261-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'bceaa7f1ae1aaa64935077469c72b0c96a1ceed9': Add Lohit fonts to the build.