Commit Graph

2254 Commits

Author SHA1 Message Date
Ying Wang ae25ec1bcd More flexibility to keep/remove R.class in static Java library
- 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
2012-06-19 10:40:37 -07:00
Ying Wang 43ca4a45a4 Remove the user tag and legacy prebuilts for the srec modules.
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
2012-06-15 18:36:06 -07:00
Jean-Baptiste Queru 74aba61404 Allow additional vendors
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
2012-06-14 09:15:20 -07:00
Keun young Park efe02ce9e0 add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
  supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media

Bug: 6623618

Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
2012-06-07 15:40:53 -07:00
Ying Wang 6afbda9f07 Merge "Clean common intermediate files if overlay changed" into jb-dev 2012-06-06 09:41:10 -07:00
Jean-Baptiste Queru 90beb4f155 Add some known binary owners
Bug: 6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
2012-06-05 08:08:06 -07:00
Ying Wang 71004f8135 Clean common intermediate files if overlay changed
This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.

This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.

Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
2012-06-04 18:02:55 -07:00
Ying Wang 28a1817590 Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
2012-06-02 09:22:31 -07:00
Wink Saville f97105ea89 Merge "Fix rild running in Nakasi." into jb-dev 2012-05-31 13:21:34 -07:00
Wink Saville 689f117b63 Fix rild running in Nakasi.
The module rild is telephony specific, since Nakasi has no radio
it shouldn't run rild. Changing the build system so rild is optional
for products that don't have telephony support.

Since rild is now optional, it is necessary to add it explicitly to
the sdk build as the sdk build is special.

Bug: 6463864
Change-Id: If944e051023b567807585fb91163a1e3f79c1024
2012-05-31 10:35:52 -07:00
Keun young Park 36e4e050ff Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev 2012-05-30 16:11:06 -07:00
Keun young Park c41c5f4e46 add add-to-product-copy-files-if-exists for pdk
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
2012-05-30 16:03:24 -07:00
Jeff Brown 01efddb0b8 Make make make faster.
Optimize common case of uniq-words where the word is not
actually duplicated.  Reduces make startup overhead.

Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
2012-05-30 13:52:22 -07:00
Keun young Park 3e93aeae10 add platform.zip from platform-java to dist
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
2012-05-29 18:13:39 -07:00
Ying Wang 82eb7082aa Fix typo.
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
2012-05-29 13:42:18 -07:00
Keun young Park d8de82fbca ignore touch error happening from broken symbolic link
- maguro platform.zip contains hdcp.keys symbolic link which is broken except env with the key
- this causes error in the touch

Bug: 6555557
Change-Id: I5f9ff5d57c87c0d3038545eeba3b553445a8493c
2012-05-25 12:22:22 -07:00
Keun young Park ac44090133 Merge "enable PDK to use platform JAVA API" into jb-dev 2012-05-24 12:53:07 -07:00
Keun young Park 816b9fd4e2 enable PDK to use platform JAVA API
- make platform-java will add necessary Java stuffs from out/target/common/
  to platform.zip
- make platform works as before: no Java libraries
- normal fusion build will pick up the file, and define TARGET_BUILD_PDK_JAVA
  besides TARGET_BUILD_PDK if Java stuffs are included
- For TARGET_BUILD_PDK_JAVA, java.mk does not touch LOCAL_SDK_VERSION, which will lead into
  pulling non-SDK Java APIs

Bug: 6482799

Change-Id: I90b1a0b06dc774150711680a6612f2b97b9eab3f
2012-05-24 11:19:31 -07:00
Ying Wang 9ccacd7a6f Set PWD to the absolute path of the top tree.
Previously PWD is passed in as a shell environmental variable,
which does not point to top of the source tree if you run mm/mmm.
That in turn breaks mm/mmm if OUT_DIR_COMMON_BASE is set to an absolute
path.

Change-Id: Iac99d5668aee1bbd3cb9897750afc2149bd9f973
2012-05-22 18:29:02 -07:00
Ying Wang 6e371e426f Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
2012-05-15 14:31:26 -07:00
Ying Wang 3ceecfa3da Check the well-formedness of an xml file before copying.
Bug: 6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
2012-05-14 14:40:58 -07:00
Dianne Hackborn 3742983d3b JellyBean is now 4.1.
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
2012-05-10 18:57:22 -07:00
Ying Wang a1ff6290e1 Now current is also a valid prebuilt SDK.
Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
2012-05-10 18:07:33 -07:00
Ying Wang 0ec188f1c1 Support to build against prebuilt current SDK in unbundled branch
Bug: 6465084
With this change and prebuilt current SDK checked in, you can build
unbundled apps with LOCAL_SDK_VERSION current in an unbundled branch.

Change-Id: I4efcee611d08a3a903bd6bf5a80de11500564206
2012-05-10 17:40:49 -07:00
Nick Kralevich ecb1a56584 x86: compile everything with relro / bind_now
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.

See:
 * http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
 * http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html

relro support has been enabled for ARM since 233d460f21.
This change enables it for x86.

Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
2012-05-09 14:49:04 -07:00
Stephen Hines b6956bdd19 Merge "Add LLVM_AS to tools." into jb-dev 2012-05-08 18:47:43 -07:00
Stephen Hines 7e48e404b1 Add LLVM_AS to tools.
Change-Id: If9b4900e743b9efbf4b12eee4ed5e713ce82db9b
2012-05-08 18:43:48 -07:00
Elliott Hughes 9264e4a5f6 The 'localize' tool is dead.
Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
2012-05-07 17:33:19 -07:00
Elliott Hughes 89898dff4e Track libnativehelper move for PDK.
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
2012-05-04 15:36:42 -07:00
Ying Wang 000e89a5b9 Strengthen dependencies on LOCAL_REQUIRED_MODULES
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
2012-04-30 16:32:25 -07:00
Colin Cross f8dc89b49a Use split-long-arguments to touch pdk platform.zip files
touch $(_pdk_fusion_files) is too long for some systems, use
split-long-arguments to execute touch multiple times with a
subset of the list of files.

Change-Id: I8e8c6770936337b93e0fdf381eca8c79fd722523
2012-04-26 17:04:54 -07:00
Ying Wang 83dbd2f158 Option to keep the generated R class in static Java libarry
Bug: 6404748
Set LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY to true to do that.

Change-Id: Ieee3cae431e3b1484ec598312729f2c871db2315
2012-04-26 12:27:38 -07:00
Nick Kralevich 233d460f21 ARM: compile everything with relro / bind_now.
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.

See:
 * http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
 * http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html

Stop using the custom linker script, which inhibits
relro / bind_now support.

Change-Id: Ie97ccdd2845886bbc2ba2fdd47eed0ff4b29b60b
2012-04-26 09:09:24 -07:00
Ying Wang e5c3a09102 Merge "Make export_includes depend on the module's definition makefile." 2012-04-24 13:29:05 -07:00
Colin Cross 7e52424e4f Merge "Set timestamps of files from platform.zip to current time" 2012-04-24 12:45:47 -07:00
Colin Cross 2bea2e6565 Set timestamps of files from platform.zip to current time
Touch files unzipped from platform.zip to update their timestamp.
Prevents make dependency confusion from files with old times.

Also add a dependency for the implicit copy rule on the
pdk_fusion.stamp file to force make to use the updated
files.

Change-Id: Ia54454518d229ce3670023819836f586fef65d3f
2012-04-24 12:36:55 -07:00
Jean-Baptiste Queru fcfb41379c Merge "On linux, always use the prebuilt host toolchain" 2012-04-24 10:37:30 -07:00
Ying Wang 68f1c77a8d Make export_includes depend on the module's definition makefile.
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
2012-04-23 21:29:18 -07:00
Jean-Baptiste Queru e1a42cc8bf Whitelist audience
Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
2012-04-23 18:27:18 -07:00
Jean-Baptiste Queru 4e82d1fa7f On linux, always use the prebuilt host toolchain
Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
2012-04-20 19:04:56 -07:00
Keun young Park ebb351e1b3 enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build

Bug: 6352960
Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
2012-04-20 16:34:33 -07:00
Keun young Park e661e35829 Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"" 2012-04-20 16:20:42 -07:00
Keun young Park b9566c0221 Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
This reverts commit 9283168e61
2012-04-20 16:18:34 -07:00
Colin Cross d71a7f7bc8 Merge "Move pdk fusion platform.zip file under vendor/pdk" 2012-04-20 15:44:29 -07:00
Keun young Park 27f8946d2d Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK" 2012-04-20 12:02:34 -07:00
Keun young Park 9283168e61 enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK

Bug: 6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
2012-04-20 10:07:31 -07:00
Colin Cross b01807b36d Merge changes I9a390206,If3e9e846
* changes:
  build: separate dist tools and ota tools
  build: remove unused ota tools
2012-04-19 17:15:44 -07:00
Jean-Baptiste Queru 700741cf45 Merge "Use an https URL" 2012-04-19 15:06:10 -07:00
Jean-Baptiste Queru 5d4bcb490e Use an https URL
Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
2012-04-19 14:53:27 -07:00
Colin Cross c312f31871 build: separate dist tools and ota tools
aapt is not needed for a dist build and not available in a pdk dist
build.  Create a new list DISTTOOLS that dist builds depends on,
and change OTATOOLS to be DISTTOOLS plus aapt, which is build by
make otatools.

Change-Id: I9a39020640b0e2cade8073aa14ee2ada9a20d78b
2012-04-19 13:54:39 -07:00