summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* avoid // in copy headers ruleColin Cross2013-10-231-1/+3
| | | | | | | | | If LOCAL_COPY_HEADERS_TO is not set, then the copy headers rule target is set to out/target/product/../obj/include//header.h. If another rule depends on the header without the //, it will fail. Don't insert LOCAL_COPY_HEADERS_TO if it is blank. Change-Id: Ideac7f8e01288ab5cca98645b307945d6ae9e97c
* update dev build IDEd Heyl2013-10-151-1/+1
| | | | Change-Id: Icb95a91c7d7ed6754438b5d6bd188cdb3f85a005
* So long Key Lime Pie, it was nice knowing you.Dianne Hackborn2013-10-031-3/+3
| | | | | | | | | | | | Now we are KitKat. I mean Android 4.4 API 19. Or whatever. Bug: 10348975 Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
* Merge "don't check paths of non-installed or host modules" into klp-devColin Cross2013-10-031-4/+5
|\
| * don't check paths of non-installed or host modulesColin Cross2013-10-021-4/+5
| | | | | | | | | | | | | | Static libraries and host modules are not installed under TARGET_OUT_VENDOR and don't need to be, relax the checks. Change-Id: Ia8b926d466420a8b6dd418d5e95fdf5ff919e078
* | support protos in host java librariesChris Wren2013-10-021-7/+24
| | | | | | | | Change-Id: Ia4499d439ea23ee4d6707cfb005b7230c0a2374f
* | Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includesYing Wang2013-10-011-3/+3
|/ | | | | | | | | | only if the module is built against the platform, not the SDK. Previously it added it if it's doing a platform build. But we can do an apps_only build inside the platform source tree and such a build may build modules against the platform. This fixes the apps build in the platform source tree. Change-Id: I73e32a8f0e505349790a102321f88e77fba472cd
* am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEMYing Wang2013-09-253-11/+18
|\ | | | | | | | | * commit 'b6da30c3724cc2a452be2c1ae425eff4f7d55944': Allow module to specify LOCAL_INSTALLED_MODULE_STEM
| * am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEMYing Wang2013-09-253-11/+18
| |\ | | | | | | | | | | | | * commit '2408479cf9cf9cfe87e464e9b5d2f36143818d37': Allow module to specify LOCAL_INSTALLED_MODULE_STEM
| | * Allow module to specify LOCAL_INSTALLED_MODULE_STEMYing Wang2013-09-253-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, you can install a shared library with module name foo as bar.so to the system.img with: LOCAL_INSTALLED_MODULE_STEM := bar.so Note that we in general still disallow a static/shared library to specify LOCAL_MODULE_STEM or LOCAL_BUILT_MODULE_STEM, because the build system uses LOCAL_MODULE to compute build time dependencies, such as export_includes, the -l linker flag etc. Also, if you use LOCAL_INSTALLED_MODULE_STEM to change the installed file name and if any other module links against this library, you may run into runtime error: the library name baked in to the binary is not the same as file name in the system image. Change-Id: I55b571c8139c3bda07a4a0e50cea0f20d8d6c168
| | * bump version to 4.3.1Baligh Uddin2013-09-231-1/+1
| | |
* | | Merge "Add android-ex-camera2 static java library to PDK." into klp-devEino-Ville Talvala2013-09-251-1/+2
|\ \ \
| * | | Add android-ex-camera2 static java library to PDK.Eino-Ville Talvala2013-09-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library is located frameworks/ex/camera2/public. This is required to allow pdk/apps/CameraITS to build in the PDK. Bug: 10337323 Change-Id: I5b835134012f90462a70b9e38b69c3168df00cfd
* | | | Don't check vendor path for phony packagesDan Willemsen2013-09-241-4/+5
|/ / / | | | | | | | | | | | | | | | These don't get installed, so they don't need to be in TARGET_OUT_VENDOR Change-Id: I887ca4758e7c477808ed9a6b621dfd3f4ede5f32
* | | Enable art for user buildsBrian Carlstrom2013-09-193-2/+4
| | | | | | | | | | | | | | | Bug: 10069754 Change-Id: Iaaff33a97bd7b68b2e8d84cd0034b15dde8a4316
* | | 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
| * | | | 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)
* | | | | Merge "Update OTA to understand SELinux labels and capabilities" into klp-devNick Kralevich2013-09-101-3/+5
|\ \ \ \ \
| * | | | | Update OTA to understand SELinux labels and capabilitiesNick Kralevich2013-09-101-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | 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
* | | | | 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
* | | | | 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
* | | | | 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
* | | | | Remove the vendor-specific vars from the protected list.Ying Wang2013-08-261-5/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I915a61034c9c3e2b886f609c4b8f4043e97bda61
* | | | | Collect NOTICE files for apps_only build.Ying Wang2013-08-243-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard ↵Ying Wang2013-08-232-0/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | obfuscation dictionary files." into jb-mr2-dev * commit 'b88ca53a465ef004a60ceb9c4c641c3c997edeb5': Collect and store proguard obfuscation dictionary files.
| * | | | am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation ↵Ying Wang2013-08-232-0/+21
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | dictionary files." into jb-mr2-dev * commit 'ddce2eb007c97b8ca94bc7b3190a83006df0c187': Collect and store proguard obfuscation dictionary files.
| | * | | am de32713f: Merge "Collect and store proguard obfuscation dictionary ↵Ying Wang2013-08-232-0/+21
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | files." into jb-mr2-dev * commit 'de32713f47b33c6d4c0bb4c8943e1eccf81aa0c5': Collect and store proguard obfuscation dictionary files.
| | | * | Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-devYing Wang2013-08-232-0/+21
| | | |\ \
| | | | * | Collect and store proguard obfuscation dictionary files.Ying Wang2013-08-232-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collect and store proguard obfuscation dictionary files. Only do this for apps_only build for now. Bug: 9407666 Change-Id: I51c78bf0f42f959dc920de230e60e0f71ed0d0ea
* | | | | | am 29695daa: am 653a037d: am 638ce57a: Treat LOCAL_APK_LIBRARIES like shared ↵Ying Wang2013-08-231-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java libraries. * commit '29695daa9734a8dfb516b7ff2e35b2b263e6b37b': Treat LOCAL_APK_LIBRARIES like shared Java libraries.
| * | | | | am 653a037d: am 638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.Ying Wang2013-08-231-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '653a037d70d770d2fc03d4f205a9c626af5f5c76': Treat LOCAL_APK_LIBRARIES like shared Java libraries.
| | * | | | am 638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.Ying Wang2013-08-231-0/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '638ce57a5848c10d781502bf198a2b93aeb58a7a': Treat LOCAL_APK_LIBRARIES like shared Java libraries.
| | | * | | Treat LOCAL_APK_LIBRARIES like shared Java libraries.Ying Wang2013-08-231-0/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix proguard build. Bug: 10307372 Change-Id: Id99d6e903077b4bacdea2e68cbb78e46a4a6afb8
* | | | | am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store ↵Ying Wang2013-08-232-21/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | proguard obfuscation dictionary files."" into jb-mr2-dev * commit '2363485c2fb3f08d36e8cdbb2240b9c3993b470c': Revert "Collect and store proguard obfuscation dictionary files."
| * | | | am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard ↵Ying Wang2013-08-232-21/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | obfuscation dictionary files."" into jb-mr2-dev * commit '06de9f940c34b8ade1f1866fbc1c6b32f93277b4': Revert "Collect and store proguard obfuscation dictionary files."
| | * | | am 8709497e: Merge "Revert "Collect and store proguard obfuscation ↵Ying Wang2013-08-232-21/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | dictionary files."" into jb-mr2-dev * commit '8709497ed82800f399e99516df59afdb1bae8472': Revert "Collect and store proguard obfuscation dictionary files."
| | | * | Merge "Revert "Collect and store proguard obfuscation dictionary files."" ↵Ying Wang2013-08-232-21/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | into jb-mr2-dev
| | | | * | Revert "Collect and store proguard obfuscation dictionary files."Ying Wang2013-08-232-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 41dbe1e535c1aea9a4c4cec6be637fe1b882220b. Change-Id: I023594779128083b75a069fd860cd29dd7951ef5