Remove all zsh compatibility code and related comments.
Display a warning when other shell is used, to prevent the illusion
that building under Zsh is supported when it's not.
Change-Id: Ie6d43ace3a30bde99aad45b00d25007ac28d5155
JarJar, like DX, can't handle the local var corruption that Emma
performs. To fix this, I'm moving the JarJar step before the Emma
step.
Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@". It seems to be
the convention that such lines print the destination, not the
source, so I made it consistent.
Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
Merge commit '2b8ba2fa20505630fbbafaf04d20e8c6d05f3b25' into gingerbread-plus-aosp
* commit '2b8ba2fa20505630fbbafaf04d20e8c6d05f3b25':
Clean up warnings in soslim
Merge commit 'd05a47c00ec3595b25ef9f46cd8b825cd35a8dca'
* commit 'd05a47c00ec3595b25ef9f46cd8b825cd35a8dca':
Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.
Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
When copying files from file systems that support high resolution
mtime, we should not truncating the nsec part. Instead we should
increase the dst mtime by one sec to prevent dst mtime to become less
than src mtime.
Change-Id: I5cab1edd4b9783ec0e3ceb04ed833d8bbba00b19
Merge commit 'd5d6095552912726f70e4a357584150c77a819e9'
* commit 'd5d6095552912726f70e4a357584150c77a819e9':
Manual merge of change 50994 from master (DO NOT MERGE)
Merge commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9' into gingerbread-plus-aosp
* commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9':
Manual merge of change 50994 from master (DO NOT MERGE)
Merge commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75'
* commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75':
Add full-eng instead of generic-eng in the lunch menu
Merging from master because I'm bringing my maps API work into
gingerbread.
Fix and enable JarJar in Java builds.
java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed. This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.
Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
Move the image sizes into a more generic key-value file. Make them
optional. Add additional key/value pairs describing what kind of
filesystem the device uses. Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.
Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.
Change-Id: I40e49e65f0d76f735259e4b4fef882322cd739da
Merge commit '8160d9316afc9e653ab93e14a347ef6789a0ebed'
* commit '8160d9316afc9e653ab93e14a347ef6789a0ebed':
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
Merge commit '7d735133cd6f019ce839fa824f4507f19aff2e8f' into gingerbread-plus-aosp
* commit '7d735133cd6f019ce839fa824f4507f19aff2e8f':
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
Merge commit '6f88d2b974eb0fef48cc4cb7f236dd2b9f449780'
* commit '6f88d2b974eb0fef48cc4cb7f236dd2b9f449780':
Change branch name to gingerbread, to match reality - DO NOT MERGE
http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.
Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.
Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c
The java version changed, and we made envsetup automatically find the right JAVA_HOME.
This change forces everyone to re-source envsetup.sh
Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee
Fix javadoc for Java 6.
If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException
Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6
Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
The inherited value has caused build breakage on Mac build.
Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2
Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Don't check STAY_OFF_MY_LAWN in set_java_home. That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.
With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.
Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
Merge commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35' into gingerbread-plus-aosp
* commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35':
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
Merge commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread
* commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c':
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
Jean-Baptiste Queru