summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around ↵Ian Rogers2014-03-103-3/+3
|\ | | | | | | | | | | | | host build differences." * commit '775d15e001d48d72a1b76982b1b5faa1eb37158f': Define __STDC_CONSTANT_MACROS globally to work around host build differences.
| * Merge "Define __STDC_CONSTANT_MACROS globally to work around host build ↵Ian Rogers2014-03-103-3/+3
| |\ | | | | | | | | | differences."
| | * Define __STDC_CONSTANT_MACROS globally to work around host build differences.Ian Rogers2014-03-103-3/+3
| |/ | | | | | | Change-Id: I945128b3087b28f62467c7123b759e3514027574
* | am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work ↵Ian Rogers2014-03-103-3/+3
|\ \ | |/ | | | | | | | | | | around host build differences."" * commit 'f1e697be5e433818071a817af0b673cba8e87795': Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
| * Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build ↵Ian Rogers2014-03-103-3/+3
| |\ | | | | | | | | | differences.""
| | * Revert "Define __STDC_LIMIT_MACROS globally to work around host build ↵Ian Rogers2014-03-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | differences." This reverts commit 668427c941bd88cacdf24d0562e6b68eb93038a1. Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
* | | am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host ↵Ian Rogers2014-03-103-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | build differences." * commit '4783dc7ab509b7099d2de83f863a9799ce67659e': Define __STDC_LIMIT_MACROS globally to work around host build differences.
| * | Merge "Define __STDC_LIMIT_MACROS globally to work around host build ↵Ian Rogers2014-03-103-3/+3
| |\ \ | | |/ | | | | | | differences."
| | * Define __STDC_LIMIT_MACROS globally to work around host build differences.Ian Rogers2014-03-103-3/+3
| |/ | | | | | | Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
* | am 60ef9d5b: Merge "jdk error message should not mention the version"Ying Wang2014-03-101-1/+1
|\ \ | |/ | | | | | | * commit '60ef9d5b263bdc6799bb6495bdd34877647d07fe': jdk error message should not mention the version
| * Merge "jdk error message should not mention the version"Ying Wang2014-03-101-1/+1
| |\
| | * jdk error message should not mention the versionChris Wren2014-03-101-1/+1
| |/ | | | | | | | | | | | | the version is checked elsewhere Bug: 13362810 Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
* | am 05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"Clay Murphy2014-03-104-19/+29
|\ \ | |/ | | | | | | * commit '05192e5a9095ac6a89757157dfd3636a2f56df7f': Docs: replacing analytics ID from D.A.C. Bug: 11476435
| * Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"Clay Murphy2014-03-104-19/+29
| |\
| | * Docs: replacing analytics ID from D.A.C.Clay Murphy2014-03-054-19/+29
| | | | | | | | | | | | | | | | | | Bug: 11476435 Change-Id: I834646e6a618709fe21afa5958bd28f822991e29
* | | am f230bcf4: Merge "OProfile is no longer compiled now."Ben Cheng2014-03-072-6/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'f230bcf4035bdbc98e64c769b192c0d33b483913': OProfile is no longer compiled now.
| * | Merge "OProfile is no longer compiled now."Ben Cheng2014-03-072-6/+0
| |\ \ | | |/ | |/|
| | * OProfile is no longer compiled now.Ben Cheng2014-03-052-6/+0
| |/ | | | | | | | | BUG: 13249790 Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
* | am 247dd0c4: Merge "Do not remove the generated .hpp file from yacc."Nicolas Geoffray2014-03-051-1/+0
|\ \ | |/ | | | | | | * commit '247dd0c4af33fc7d3ebcfc058837e131e5185546': Do not remove the generated .hpp file from yacc.
| * Merge "Do not remove the generated .hpp file from yacc."Nicolas Geoffray2014-03-051-1/+0
| |\
| | * Do not remove the generated .hpp file from yacc.Nicolas Geoffray2014-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Depending on the file extension of the generated C++ file, bison will generate a #include of a .h or .hpp. So both files must be kept in the generated directory. Change-Id: Id0aac7f407bdc69c7f5012c0d021761b0fceb427
* | | am 68d38154: Merge "Remove host-prefix command line argument to dex2oat."Nicolas Geoffray2014-03-041-2/+1
|\ \ \ | |/ / | | | | | | | | | * commit '68d381540f822849f3bcd7620f773aa9ba004900': Remove host-prefix command line argument to dex2oat.
| * | Merge "Remove host-prefix command line argument to dex2oat."Nicolas Geoffray2014-03-041-2/+1
| |\ \ | | |/ | |/|
| | * Remove host-prefix command line argument to dex2oat.Nicolas Geoffray2014-03-041-2/+1
| |/ | | | | | | Change-Id: If4a962976d1e8a283d6b682112a1b12d328d8dbb
* | am 6808c260: Merge "Use analyzer at new location: ↵Andrew Hsieh2014-03-032-3/+3
|\ \ | |/ | | | | | | | | | | prebuilts/misc/{linux-x86,darwin-x86}/analyzer" * commit '6808c2608f0eff3275110154d7267f934700c167': Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
| * Merge "Use analyzer at new location: ↵Andrew Hsieh2014-03-042-3/+3
| |\ | | | | | | | | | prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
| | * Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzerAndrew Hsieh2014-03-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analyzer needed by WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK is moved from prebuilts/clang/{linux-x86,darwin-x86}/host/3.3 to prebuilts/misc/{linux-x86,darwin-x86}/analyzer See https://android-review.googlesource.com/#/c/83852/ BUG=13243591 Usage: "WITH_SYNTAX_CHECK=1 make ..." instructs build system to invoke "clang -fsyntax-only" to utilize clang's better diagnostics before calling LOCAL_CC/LOCAL_CXX for code generation. The compilation time is slightly longer, and the generated object file should be the same as w/o WITH_SYNTAX_CHECK "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..." instructs build system to run static analyzer via "clang --analyze" on a successful build. If analyzer finds any issue, instruction to open report is displayed. See http://clang-analyzer.llvm.org/scan-build.html for details. WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK if both exist. Project use lots of GCC extensions (eg. nested function) not supported by clang may opt out by adding LOCAL_NO_STATIC_ANALYZER:=true Change-Id: Ib3dda3ffb0fd3aaf2eadec867a966d1dd2868fb1
* | | am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."Victoria Lease2014-03-032-0/+6
|\ \ \ | |/ / | | | | | | | | | * commit '38626e635771a9e1d5ee8f812ea967d842938052': Add external/google-fonts/*/fonts.mk.
| * | Merge "Add external/google-fonts/*/fonts.mk."Victoria Lease2014-03-032-0/+6
| |\ \
| | * | Add external/google-fonts/*/fonts.mk.Victoria Lease2014-02-282-0/+6
| | | | | | | | | | | | | | | | | | | | Bug: 12384866 Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
* | | | am 460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."Nicolas Geoffray2014-03-031-12/+42
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '460ed38aa977fd9c4318ba8e67e65805cddad6bb': Extend YACC and LEX handling to .yy and .ll files.
| * | | Merge "Extend YACC and LEX handling to .yy and .ll files."Nicolas Geoffray2014-03-031-12/+42
| |\ \ \
| | * | | Extend YACC and LEX handling to .yy and .ll files.Nicolas Geoffray2014-03-031-12/+42
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | The external mclinker project has .yy and .ll files that require the same rules as .y and .l. Change-Id: I2b02df9a74bac9c215f8aeb8ee2ff0d2616526ed
* | | | am 368faf83: Merge "Add usage comment to explain how to limit modules in mmm."Primiano Tucci2014-03-031-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '368faf835b45647bd1961a3a2321daa45ad31568': Add usage comment to explain how to limit modules in mmm.
| * | | Merge "Add usage comment to explain how to limit modules in mmm."Primiano Tucci2014-03-031-0/+1
| |\ \ \
| | * | | Add usage comment to explain how to limit modules in mmm.Primiano Tucci2014-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68895a96 has introduced the possibility to limit the modules being built by mmm. In many occasions this can save a lot of developement time since it allows to build one target without processing all the makefiles in the Android tree. Unfortunatelly this nice feature is undocumented. This CL adds the one line documentation. Change-Id: I6ded32c4774047599e9c44e5ea71c07e65731cda
* | | | | am 0d08449c: Merge "Amend 64 bit blacklist."Narayan Kamath2014-03-031-10/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0d08449c0c09c4a24be13b3ac89f4e34369d3b4c': Amend 64 bit blacklist.
| * | | | Merge "Amend 64 bit blacklist."Narayan Kamath2014-03-031-10/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Amend 64 bit blacklist.Narayan Kamath2014-03-031-10/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - external/skia now builds on arm64, frameworks/base/libs/hwui depends on it. - external/bluetooth/bluedroid builds on 64 bit, though there isn't any obvious way to test it without real hardware. - frameworks/ml now builds, as does external/srec - frameworks/opt, frameworks/ex and frameworks/wilhelm don't build because of their dependency on frameworks/av. frameworks/av should probably be dropped out of the blacklist and replaced by individual markers on targets that we want for 64 bit (we don't want all of them for arm64). Change-Id: I9735108840fcba21ac8918bedf0d6de8989de086
* | | | am 26bcd640: Merge "Try to catch more misuse of ."Ying Wang2014-03-012-6/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '26bcd6404031a491bfd5314d605a7dcc6b64727b': Try to catch more misuse of $(my-dir).
| * | | Merge "Try to catch more misuse of $(my-dir)."Ying Wang2014-03-012-6/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Try to catch more misuse of $(my-dir).Ying Wang2014-02-282-6/+9
| |/ / | | | | | | | | | Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7
* | | am 2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."Ben Cheng2014-02-281-13/+61
|\ \ \ | |/ / | | | | | | | | | * commit '2bd77d5ebe55e0b7ac9ae4f84ec76b0c82e317a4': Make gdbclient smarter for gdb[server] setup.
| * | Merge "Make gdbclient smarter for gdb[server] setup."Ben Cheng2014-02-281-13/+61
| |\ \
| | * | Make gdbclient smarter for gdb[server] setup.Ben Cheng2014-02-281-13/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can detect and support 3 different scenarios: - 32-bit exe / 32-bit OS - 64-bit exe / 64-bit OS - 32-bit exe / 64-bit OS Change-Id: I799a91277a5e2331aebf4b2f031e9a79f7ab5bb0
* | | | am cf1b7d4b: Merge "Select src arch for prebuilts."Ying Wang2014-02-272-2/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cf1b7d4b2879f856c831587b52f17063da6af158': Select src arch for prebuilts.
| * | | Merge "Select src arch for prebuilts."Ying Wang2014-02-282-2/+13
| |\ \ \
| | * | | Select src arch for prebuilts.Ying Wang2014-02-272-2/+13
| |/ / / | | | | | | | | | | | | Change-Id: I2d08f923d28d59cfef93ff0bd9893352baaee60b
* | | | am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that ↵JP Abgrall2014-02-270-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | tcpdump+64bit=ok" * commit '031bff45d051b0cdfcfdca4e35a3ab213e105fce': DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
| * | | Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"JP Abgrall2014-02-271-1/+0
| |\ \ \
generated by cgit v1.1 at 2025-03-21 03:09:48 +0000