summaryrefslogtreecommitdiffstats
path: root/core/definitions.mk
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 5836d3b3 to jb-mr1-devJoe Onorato2012-08-171-4/+5
|\ | | | | | | Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
| * Remove support for user tags in the build system.Joe Onorato2012-08-161-4/+0
| | | | | | | | | | | | | | | | It is not forbidden to say LOCAL_MODULE_TAGS := user, and if you don't say LOCAL_MODULE_TAGS, it now defaults to optional. Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
| * Don't give the user tag to host modules automatically.Joe Onorato2012-08-161-0/+5
| | | | | | | | Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
* | am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"Jean-Baptiste Queru2012-08-081-4/+4
|\ \ | |/ | | | | | | * commit 'a4814370724634c0ee0bf35bc68f382f0df93668': definitions.mk: Don't use GCC '@' parameter
| * definitions.mk: Don't use GCC '@' parameterAndrew Boie2012-07-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This parameter (which causes GCC to pull additional command line parameters out of a file) is incompatible with ccache. - With ccache 2.x, ccache will ignore this parameters, and potentially compute invalid command line hashes since it is not reading the parameter file - With ccache 3.x, ccache will refuse to cache the files and error with 'Unsupported compiler option'. We still use the parameter file, but Make expands it instead. Change-Id: I070c3877cbe2d058e1cf4754bac535e7f3498861 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | resolved conflicts for merge of 9b76c054 to masterYing Wang2012-06-191-0/+8
|\ \ | |/ | | | | Change-Id: I4190ef6895b7ddb27d9a293cbacecdef1f4f20b8
| * More flexibility to keep/remove R.class in static Java libraryYing Wang2012-06-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your Android.mk, if your static library is directly used by an app. - If your library will be included by another library that need reference the R/Manifest class, you can set LOCAL_JAR_EXCLUDE_FILES := none to keep the generated classes. - If your library includes another static library that has Android resource and you want to remove the generated classes carried by the static library, set: LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES) With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY. Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
* | Make building an empty static library work.Torne (Richard Coles)2012-06-151-1/+3
| | | | | | | | | | | | | | | | | | | | Handle the case where a static library is not built because it has no input files (e.g. because they are conditionally included and it happens that the computed list is empty). Previously, ar never ran because of split-long-arguments, and anything that depended on the static library would fail to link. Make sure that ar runs at least once. Change-Id: If0071d7ae50c4e45fff1772dca43187af155db1f
* | Merge commit 'bf2e8a66' into workJoe Onorato2012-05-171-0/+12
|\ \ | |/ |/| | | Change-Id: I5cd704eb59218b56b48d689afdff84638deeacf1
| * Add copy-many-files macro.Joe Onorato2012-05-171-0/+13
| | | | | | | | Change-Id: I327fc19bdf9c1ada18b3ba695fe4104e2a241156
| * Add a tool to let you enforce layering between packages in a java module.Joe Onorato2011-10-301-0/+2
| | | | | | | | | | | | And build system support for it too. Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
* | Check the well-formedness of an xml file before copying.Ying Wang2012-05-141-0/+10
| | | | | | | | | | Bug: 6491991 Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
* | Strengthen dependencies on LOCAL_REQUIRED_MODULESYing Wang2012-04-301-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6418863 This change expands the PRODUCT_PACKAGES with the required modules. Before this change, since the required modules are not in the PRODUCT_PACKAGES, they are not directly depended on by the image files. If the dependent is not to be included in the image but the required modules are to be included, the dependency of the image on the required modules gets lost! That would lead to build race condition. Change-Id: I0b656db1538ca43d3785dbf17364ffa88b80ac41
* | Make export_includes depend on the module's definition makefile.Ying Wang2012-04-231-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 6383397 Note that LOCAL_MODULE_MAKEFILE is calculated in the macro my-dir, which must be called at the beginning of your Android.mk to calculate LOCAL_PATH. Change-Id: I7aa079e37253fbda25ffb85c2e5bbf0663340e27
* | Merge "Build system support to export include paths"Ying Wang2012-04-091-0/+4
|\ \
| * | Build system support to export include pathsYing Wang2011-11-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5573756 With this change, we can set LOCAL_EXPORT_C_INCLUDE_DIRS in the module definition to export include dir paths. Paths in LOCAL_EXPORT_C_INCLUDE_DIRS should be relative to the top dir of the source tree. If a library (shared or static) exports some include paths, any module using it will import the include paths and add them to the compiler command line. Change-Id: I49aabc589d2cf214044d13ccd5532ef68209adf0
* | | optional cross-check between OTA radio images and board-info.txtDoug Zongker2012-03-211-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a python script which checks the version of each radio image added with the new add-radio-file-checked macro against a file containing sha-1 -> version string mappings and the contents of board-info.txt, so that the build can fail if board-info.txt and the OTA images are out of sync. Change-Id: Icb61dc2adefc240ced9059941582c23b629089c0
* | | Merge "Increase java heap size."Wink Saville2012-01-301-1/+1
|\ \ \
| * | | Increase java heap size.Wink Saville2012-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I got an Out of memory while compiling, Andreas Huber suggested that increasing the heap size, which worked. Change-Id: Id8293ef100ef814b0fe13aa6e1b891a36a2ee853
* | | | Build should fail if any proto file fails compilingYing Wang2012-01-301-1/+1
|/ / / | | | | | | | | | | | | | | | When compile multipling proto files to Java in a for loop. Change-Id: Ie6a9d3972401b0ad6406bf911db916fcbf88037b
* | | Merge "Get build system to work with Make 3.82"Conley Owens2011-12-221-1/+1
|\ \ \
| * | | Get build system to work with Make 3.82Conley Owens2011-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Note: `sort` can't seem to handle newlines in 3.82. Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
* | | | am 05e98055: am 60fe963c: build: explicitly define dependency filesAtte Peltomaki2011-12-211-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * commit '05e98055fdb1d48bac80790cb719838598b687e8': build: explicitly define dependency files
| * | | build: explicitly define dependency filesAtte Peltomaki2011-12-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Groundwork for distcc support in Android build system, see distcc FAQ for details on why -MF is needed: http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
| * | | am e915ab45: Place linker arguments after objects for gccConley Owens2011-11-101-7/+7
| |\ \ \ | | |_|/ | |/| | | | | | | | | | * commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593': Place linker arguments after objects for gcc
| | * | Place linker arguments after objects for gccConley Owens2011-11-101-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc 4.6.1 does not properly link if libraries are specified before objects. Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
* | | | Merge "Collect the GPL source files."Ying Wang2011-12-161-0/+3
|\ \ \ \
| * | | | Collect the GPL source files.Ying Wang2011-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5693205 Change-Id: I045b83949f8b29d7c5cf5c0ab32c5b83cf398e71
* | | | | Remove the R/Manifest classes when building the static Java libraryYing Wang2011-12-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5448433 Instead of deferring the removal to building the app. In that case any R/Manifest classes in any static Java libraries will be deleted, no matter if they are generated from Android resource, or just source R.java/Manifest.java in the source tree by accident. Change-Id: I656f45e3cbc3796c5d4832363231480b3f1dc5b8
* | | | | Don't remove R class to fix the build.Ying Wang2011-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately there is R.java checked in the source tree that gets built into static library. So we have to find a way to delete classes from R.java generated by the build system on the fly. Change-Id: I2d82d28234cecbf6dd5b02b2dd4f7dbd47e3b626
* | | | | Support to build static Java library with Android resourceYing Wang2011-12-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
* | | | | Allow to build Java module from mere static Java libraries.Ying Wang2011-12-121-2/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | With this change, we can easily turn a static Java library to a shared Java library. Change-Id: I9915992cd19879846511d6272483d7a0a934e7eb
* | | | Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.Stephen Hines2011-12-071-0/+1
| | | | | | | | | | | | | | | | Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
* | | | Print more info of the image size stats.Ying Wang2011-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5620615 Before this change it only reports the limit if the real size exceeeds or approaches the limit. Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e
* | | | Bypass alias for grep in the tapas command.Jeff Hamilton2011-11-181-1/+1
| |_|/ |/| | | | | | | | Change-Id: I82705535bda927ddc7e9aebb9610d712b68a50d2
* | | Place linker arguments after objects for gccConley Owens2011-11-101-7/+7
|/ / | | | | | | | | | | | | gcc 4.6.1 does not properly link if libraries are specified before objects. Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
* | Merge "Compile each proto file separately"Bjorn Bringert2011-10-181-5/+7
|\ \
| * | Compile each proto file separatelyBjorn Bringert2011-10-181-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, if a module had several proto source files, they would all be compiled in a single invocation of aprotoc. If any of the files imported one of the other files, you got an aprotoc error about duplicates. And if you removed the files that were imported from the list of source files, no Java code would be generated for the imported files, causing a Java compile time error. This changes compiles each proto file separately, which avoids both of the problems above. It's slightly more inefficient, but aprotoc is really fast. Change-Id: I7bd8092ec2953c20269367a1c68ff84acceea3be
* | | am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.Dianne Hackborn2011-10-171-0/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'a0f464a8e7f006177db084df7e925bbb8e5ffed3': New PRODUCT_AAPT_PREF_CONFIG.
| * | New PRODUCT_AAPT_PREF_CONFIG.Dianne Hackborn2011-10-141-0/+1
| |/ | | | | | | | | | | | | | | To use the new aapt --preferred-configurations option. For use with Prime to be able to strip everything but xhdpi density bitmaps selectively, not stripping when this would result in no data for the resource. Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2
* | Merge "Use shell variable to eliminate $(eval) in commands."Ying Wang2011-10-111-4/+3
|\ \ | |/ |/|
| * Use shell variable to eliminate $(eval) in commands.Ying Wang2011-07-271-4/+3
| | | | | | | | | | | | | | $(eval) in the commands does not evaulate in the same order in emake as in gmake. Using shell vars work in both makes. Change-Id: I4e95adb2bc6f4600e29b9a8524275a099f47a401
* | Merge "Discard hidden files when rounding up resource."Ying Wang2011-09-081-1/+1
|\ \
| * | Discard hidden files when rounding up resource.Ying Wang2011-08-101-1/+1
| |/ | | | | | | | | | | | | | | Aapt will discard the hidden files anyway. With this change, we can avoid unnecessary rebuild if a module has only hidden files in its resource dir. Change-Id: Iaf0a13e038cca5fb60012c550cc90f7abbe967e1
* | Update build to properly use prebuilt llvm-rs-cc.Stephen Hines2011-08-101-0/+1
|/ | | | Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6
* Uniq the system properties.Ying Wang2011-06-171-0/+15
| | | | | | | If multiple items with the same key appear in a config variable, only the first item is taken. Change-Id: Icf57befafb36ec35dd4d48c8c3ec595f353f68e7
* Use arg list file to pass arguments to jar.Ying Wang2011-06-061-2/+4
| | | | | | To fix error "/bin/bash: Argument list too long" Change-Id: Ie336b18f9a7eba38d94a6e32c07a88589ce9f1fd
* am 823f6389: am 3487736b: am 7d83ef8f: Support custom RenderScript compilerYing Wang2011-06-021-1/+1
|\ | | | | | | | | * commit '823f63894fb4ad5c1280a5ee7eb004792223a488': Support custom RenderScript compiler
| * am 3487736b: am 7d83ef8f: Support custom RenderScript compilerYing Wang2011-05-271-1/+1
| |\ | | | | | | | | | | | | * commit '3487736bac5625bef8ff9bc4ef311b29348055d9': Support custom RenderScript compiler
| | * Support custom RenderScript compilerYing Wang2011-05-271-1/+1
| | | | | | | | | | | | Change-Id: I85e38e84565e04f99dd26217f280274883dc322d
generated by cgit v1.1 at 2025-03-22 22:20:29 +0000