summaryrefslogtreecommitdiffstats
path: root/core/main.mk
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master."Narayan Kamath2014-04-021-1/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0239220a67f168fa30703e07750d1f4907dc99bf': Bring main.mk in sync with master.
| | * | Bring main.mk in sync with master.Narayan Kamath2014-04-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These lines were removed in aosp in commit e2d27887b but a bad merge conflict resolution left them in master. Subsequent changes on master started using these variables so they're being brought back. Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
* | | | resolved conflicts for merge of f966bda4 to masterYing Wang2014-03-311-4/+4
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322
| * | | am 4714d3d7: am b34af41e: Merge "Fix java version detection when ↵Ying Wang2014-04-011-6/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | _JAVA_OPTIONS is set." * commit '4714d3d7a604391d174049a7a595e80ebab2da18': Fix java version detection when _JAVA_OPTIONS is set.
| | * | Fix java version detection when _JAVA_OPTIONS is set.Peter Ammon2014-03-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _JAVA_OPTIONS is an environment variable that can be used to affect the behavior of java and javac. It is currently required to get Android to build on some configurations, where the default Java heap size is too small. Unfortunately, if _JAVA_OPTIONS is set, both java and javac will output its value to the console as the first line on every invocation, including trivial ones like java -version. This will confuse main.mk’s version detection, which only looks at the first line of output. Tweak the version detection to run grep before head, so that the _JAVA_OPTIONS line is filtered by the grep. Change-Id: I69aee52b56d27711b7d3087ec6b3ebab07ffc3af
* | | | Merge "Add warning message for java6 builds."Narayan Kamath2014-03-211-1/+12
|\ \ \ \
| * | | | Add warning message for java6 builds.Narayan Kamath2014-03-201-1/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: If5a402e1412e5adb5340b101854e9fbb4c5d4ec8
* | | | | am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the ↵Ying Wang2014-03-201-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | redundant DISABLE_DEXPREOPT" * commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4': Remove the redundant DISABLE_DEXPREOPT
| * | | am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"Ying Wang2014-03-201-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37': Remove the redundant DISABLE_DEXPREOPT
| | * | Remove the redundant DISABLE_DEXPREOPTYing Wang2014-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To disable dexpreopt, use just: WITH_DEXPREOPT=false Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
* | | | am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the ↵Ying Wang2014-02-261-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | \'samplecode\' rules." * commit '332bbced6d075eccdf54b00d4178afc59db6f096': Conditionally include the 'samplecode' rules.
| * | | am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."Ying Wang2014-02-261-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b': Conditionally include the 'samplecode' rules.
| | * | Conditionally include the 'samplecode' rules.Ying Wang2014-02-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Not sure goal 'samplecode' is still used by anybody these days. Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
* | | | add exception to be able to build emulator_tests in conjunction with theTsu Chiang Chuang2014-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | sdk. Change-Id: Ic4c63c756c78da97657e08faa5b4b6891b951b03
* | | | am 52cefc36: resolved conflicts for merge of 6ca56b6a to ↵Ying Wang2014-02-181-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838': Make the module existence check nonfatal
| * | | resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aospYing Wang2014-02-181-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce
| | * Make the module existence check nonfatalYing Wang2014-02-141-1/+5
| | | | | | | | | | | | | | | | | | | | | Now we have sdk variants that may inherit the non-existent module names from the device product. Change-Id: Ibe96a33cde650fd79ae4731561dcb674203c3b91
* | | am 1e8fec5b: am e2f06adb: Merge "Don\'t check the existence for the 64-bit ↵Ying Wang2014-02-141-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | modules for 32-bit SDK build." * commit '1e8fec5baea381604a2bf197bfb091eeb7aa36ef': Don't check the existence for the 64-bit modules for 32-bit SDK build.
| * | Don't check the existence for the 64-bit modules for 32-bit SDK build.Ying Wang2014-02-131-0/+4
| | | | | | | | | | | | Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc
* | | am 2c32144b: resolved conflicts for merge of 7cd7bd65 to ↵Colin Cross2014-02-121-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '2c32144b328e0191fa32bf342dc7eb01d6174b6e': HACK: add 64-bit directory blacklist add support for module supported or unsupported target architectures
| * | HACK: add 64-bit directory blacklistColin Cross2014-02-121-0/+2
| | | | | | | | | | | | Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
* | | resolved conflicts for merge of b6d53f0b to masterYing Wang2014-02-121-1/+5
|\ \ \ | |/ / | | | | | | Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
| * | Merge "Clean up dangling module names"Ying Wang2014-02-121-1/+5
| |\ \
| | * | Clean up dangling module namesYing Wang2014-02-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those modules have disappeared from the source tree. https://code.google.com/p/android/issues/detail?id=61210 Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
* | | | am 1968f286: am b12cce10: Merge "Refine module name resolving in multilib build"Ying Wang2014-02-121-1/+56
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1968f286d69c36692bd5788fa8745ed16ccc03cb': Refine module name resolving in multilib build
| * | | Refine module name resolving in multilib buildYing Wang2014-02-101-1/+56
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Added TARGET_PREFER_32_BIT, which sets LOCAL_32_BIT_ONLY for an executable, if LOCAL_NO_2ND_ARCH is not true. Name resolving in 64-bit multilib build: -- Name resolving in PRODUCT_PACKAGES: foo:32 resolves to foo_32; foo:64 resolves to foo; foo resolves to both foo and foo_32 (if foo_32 is defined). -- Name resolving for LOCAL_REQUIRED_MODULES: If a module is built for 2nd arch, its required module resolves to 32-bit variant, if it exits; Otherwise for executable and shared library, a required module resolves to the default 64-bit variant; for other module classes, required module foo resolves to both foo and foo_32 (if foo_32 is defined) Bug: 12898862 Change-Id: I5fda1a77f58814097b10b5ad2743ee25adfaecc4
| * | Dedup the targets and dependencies of required modules.Ying Wang2014-01-311-0/+2
| |/ | | | | | | | | | | | | | | For whatever reason, two modules may have the same file as their installed module. In that case circular dependency is created if the two modules have requited-by relation. Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
| * Set up rules to build shared libraries for TARGET_2ND_ARCHYing Wang2014-01-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | The rules for the 2nd arch are set up in the second inclusion of shared_library_internal.mk. Intermediate fils of libfoo of the 2nd arch will be built into $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/ and the built libfoo.so will be in $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib. Bug: 11654773 Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
| * Add missing paren in "java -version" checkBrian Carlstrom2014-01-201-1/+1
| | | | | | | | Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
* | Dedup the targets and dependencies of required modules.Ying Wang2014-01-311-0/+2
| | | | | | | | | | | | | | | | For whatever reason, two modules may have the same file as their installed module. In that case circular dependency is created if the two modules have requited-by relation. Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
* | Set up rules to build shared libraries for TARGET_2ND_ARCHYing Wang2014-01-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | The rules for the 2nd arch are set up in the second inclusion of shared_library_internal.mk. Intermediate fils of libfoo of the 2nd arch will be built into $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/ and the built libfoo.so will be in $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib. Bug: 11654773 Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
* | resolved conflicts for merge of 6835cbf9 to masterNarayan Kamath2013-12-061-9/+20
|\ \ | |/ | | | | Change-Id: I21593edf5f597bc79ff91b756bdaf6921b05cba7
| * A few more Java7 related clean ups.Narayan Kamath2013-12-051-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | - Separate SDK checking from version checking and make messages clearer. - Add explicit source & target versions for javac to make things clearer. - Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to EXPERIMENTAL_USE_JAVA7. - Allow Oracle JDK 1.7 to be used on Mac OS, since there's no official OpenJDK support for that platform. Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
* | am 71e5dd30: am 7a772619: Merge "core: support make 4.00"Ying Wang2013-12-021-4/+2
|\ \ | |/ | | | | | | * commit '71e5dd3055dc6a441ce20f0905f1b3893f79d27e': core: support make 4.00
| * Merge "core: support make 4.00"Ying Wang2013-12-021-4/+2
| |\
| | * core: support make 4.00synergydev2013-10-171-4/+2
| | | | | | | | | | | | | | | | | | Make 4.00 is now out, and builds work fine with it. Change-Id: I49e36d651a7997a52270badb0e8badd975f64e8f
| * | Add experimental flag to support OpenJDK builds.Ying Wang2013-11-261-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | bug: 8992787 (cherry picked from commit d1dbe7f5a23bacdff086b4992e1d31a96da706c3) Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
| * | Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEADThe Android Open Source Project2013-11-221-34/+44
| |\ \ | | | | | | | | | | | | Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
* | | | Call "java[c] -version" only onceYing Wang2013-11-131-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and print out the full output if error occurs. Bug: 11672548 Change-Id: Iba217789f7ab69d73902a4dc82e8975b2f6a48fc
* | | | am 36e681b0: resolved conflicts for merge of 12f87a5b to klp-dev-plus-aospElliott Hughes2013-11-071-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '36e681b02a7cd2554f038bcac65d7fdfc7889273': Remove the hacks needed to support ash and mksh concurrently.
| * \ \ \ resolved conflicts for merge of 12f87a5b to klp-dev-plus-aospElliott Hughes2013-11-071-2/+0
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
| | * | am a05365ce: Merge "Remove the hacks needed to support ash and mksh ↵Elliott Hughes2013-11-071-2/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concurrently." * commit 'a05365ceceaead86651f61f7ba66153e36b7be5d': Remove the hacks needed to support ash and mksh concurrently.
| | | * | Remove the hacks needed to support ash and mksh concurrently.Elliott Hughes2013-11-051-2/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | We no longer have ash, and we'd rather not have unnecessary symbolic links on the system. Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
| | | * Remove unnecessary dependencies between host and target modules.Ying Wang2013-09-181-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, modules introduced by LOCAL_REQUIRED_MODULES will be split by host/target: target modules only depend on target modules and host modules only depend on host modules. Bug: 9303948 Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
* | | | Add experimental flag to support OpenJDK builds.Ying Wang2013-10-281-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | bug: 8992787 Change-Id: Ice0fc7dea1d855914fdab9a01b1ac9c722031288
* | | | "make dist" should not try to package apps for embedded buildsMike Lockwood2013-10-021-0/+2
|/ / / | | | | | | | | | Change-Id: Icbe522737f7b8a44c8a458b32678fe0472b94dff
* | | 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
* | | In apps_only build dist a module only if it has a BUILT file.Ying Wang2013-08-271-1/+1
| | | | | | | | | | | | | | | | | | This allows you to specify a PHONY target in TARGET_BUILD_APPS. Change-Id: Idd813cd0dbdb14c705fbd3187596d4c64b99d045
* | | Collect NOTICE files for apps_only build.Ying Wang2013-08-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | In apps_only build (after running tapas or exporting TARGET_BUILD_APPS), run "make notice_files" to collect and combine the NOTICE files of modules that are needed by the apps. Bug: 10445634 Change-Id: I6555bba1104e43b48c723c82143c46d444a75e80
generated by cgit v1.1 at 2025-03-20 10:43:27 +0000