OSDN Git Service
Elliott Hughes [Thu, 20 Aug 2015 21:43:17 +0000 (21:43 +0000)]
am
ded991b4: Merge "Revert "Fix Windows SDK build.""
* commit '
ded991b47d0235bd505b5d95e438118d0b7f1041':
Revert "Fix Windows SDK build."
Elliott Hughes [Thu, 20 Aug 2015 21:43:16 +0000 (21:43 +0000)]
am
a6065996: Merge "Stop defining WIN32."
* commit '
a6065996cd280acf11f199c1f90e1b8886635207':
Stop defining WIN32.
Elliott Hughes [Thu, 20 Aug 2015 21:23:59 +0000 (21:23 +0000)]
Merge "Revert "Fix Windows SDK build.""
Elliott Hughes [Thu, 20 Aug 2015 21:22:19 +0000 (21:22 +0000)]
Revert "Fix Windows SDK build."
This reverts commit
b8dd176441f6ba9527d24a5065d8225437fe39d5.
This wasn't the problem, and mingw doesn't even use _LARGEFILE_SOURCE. The real problem (using WIN32 instead of _WIN32 in external/llvm) is fixed now.
Change-Id: I2b708a006b530cb18d03b1425cd65edda35ee17e
Elliott Hughes [Thu, 20 Aug 2015 21:21:01 +0000 (21:21 +0000)]
Merge "Stop defining WIN32."
Elliott Hughes [Thu, 20 Aug 2015 21:04:18 +0000 (14:04 -0700)]
Stop defining WIN32.
Change-Id: Iac0b4745579e6de55bea02571617ae561308e1a9
Ying Wang [Thu, 20 Aug 2015 20:53:32 +0000 (20:53 +0000)]
am
11a38e7a: Merge "Support LOCAL_INIT_RC."
* commit '
11a38e7a9164bc3268344ce716c4bd12b08cb05c':
Support LOCAL_INIT_RC.
Ying Wang [Thu, 20 Aug 2015 20:47:53 +0000 (20:47 +0000)]
Merge "Support LOCAL_INIT_RC."
Ying Wang [Thu, 20 Aug 2015 19:02:10 +0000 (12:02 -0700)]
Support LOCAL_INIT_RC.
A module can install a companion init.rc file,
by specifying:
LOCAL_INIT_RC := <init.rc-file-path-replative-to-LOCAL_PATH>
You can also use the variant with _32 or _64 suffix.
Bug:
23186545
Change-Id: I00a96509f5707ae39361a0c5555fa59d46c90322
Elliott Hughes [Thu, 20 Aug 2015 18:18:50 +0000 (18:18 +0000)]
am
999fd4ea: Merge "Also -DWIN32 to keep llvm building."
* commit '
999fd4ea850b494f38ac23195ad5c2ee0b9486a2':
Also -DWIN32 to keep llvm building.
Elliott Hughes [Thu, 20 Aug 2015 18:11:18 +0000 (18:11 +0000)]
Merge "Also -DWIN32 to keep llvm building."
Elliott Hughes [Thu, 20 Aug 2015 18:10:22 +0000 (11:10 -0700)]
Also -DWIN32 to keep llvm building.
Change-Id: Ic8e70f35dda23226d60010a38cf5633840772310
Elliott Hughes [Thu, 20 Aug 2015 17:26:50 +0000 (17:26 +0000)]
am
79b199b8: Merge "Fix Windows SDK build."
* commit '
79b199b80e98ff7d0340de8c55f0da6d085e9ef8':
Fix Windows SDK build.
Elliott Hughes [Thu, 20 Aug 2015 17:20:45 +0000 (17:20 +0000)]
Merge "Fix Windows SDK build."
Elliott Hughes [Thu, 20 Aug 2015 17:19:26 +0000 (10:19 -0700)]
Fix Windows SDK build.
I forgot that removing a file doesn't cause a rebuild in our lame build
system, so I hadn't actually tested my previous change.
Change-Id: Ida19d4a8fd40e37029031eac4b4ca5f0cc5c895b
Elliott Hughes [Thu, 20 Aug 2015 17:06:48 +0000 (17:06 +0000)]
am
57069e59: Merge "Remove Windows AndroidConfig.h."
* commit '
57069e5974c3224550c3cf3a12dbe6ffac4b0c79':
Remove Windows AndroidConfig.h.
Elliott Hughes [Thu, 20 Aug 2015 16:59:03 +0000 (16:59 +0000)]
Merge "Remove Windows AndroidConfig.h."
Elliott Hughes [Thu, 20 Aug 2015 00:45:17 +0000 (17:45 -0700)]
Remove Windows AndroidConfig.h.
The only things left that we're using are the Windows target version
and _FILE_OFFSET_BITS=64, and they can go in the combo .mk.
Also fix the unused Windows 64 .mk.
Change-Id: I5f2458d67c0a8201196a339573f861bbf18b7eb8
Shinichiro Hamaji [Thu, 20 Aug 2015 05:31:30 +0000 (05:31 +0000)]
am
e7d6f04d: Merge "Add two flags for the latest ckati"
* commit '
e7d6f04d32c26e1355a1a01008941477c1432611':
Add two flags for the latest ckati
Shinichiro Hamaji [Thu, 20 Aug 2015 05:25:34 +0000 (05:25 +0000)]
Merge "Add two flags for the latest ckati"
Dan Albert [Thu, 20 Aug 2015 05:13:56 +0000 (05:13 +0000)]
am
6b966aff: Merge "Fix sanitizer choice for global vs module."
* commit '
6b966aff43fc4d80b8f35ef2a333107f68ac2be0':
Fix sanitizer choice for global vs module.
Dan Albert [Thu, 20 Aug 2015 05:07:34 +0000 (05:07 +0000)]
Merge "Fix sanitizer choice for global vs module."
Dan Albert [Thu, 20 Aug 2015 03:13:33 +0000 (20:13 -0700)]
Fix sanitizer choice for global vs module.
The sanitizer chosen by the environment (either by SANITIZE_TARGET or
SANITIZE_HOST) should be chosen over the one specified by the module.
Bug: http://b/
23330588
Change-Id: I835b7d76e071fc0db2f859f98dfb9d7ff76af245
Elliott Hughes [Wed, 19 Aug 2015 22:18:33 +0000 (22:18 +0000)]
am
b3c585d7: Merge "Stop defining HAVE_MS_C_RUNTIME."
* commit '
b3c585d745918bebb6e4ea72ad60875adf53337e':
Stop defining HAVE_MS_C_RUNTIME.
Elliott Hughes [Wed, 19 Aug 2015 22:09:32 +0000 (22:09 +0000)]
Merge "Stop defining HAVE_MS_C_RUNTIME."
Christopher Wiley [Wed, 19 Aug 2015 21:47:27 +0000 (21:47 +0000)]
am
9e3b4ed4: Merge "Fix DBus proxies to use all definitions"
* commit '
9e3b4ed4991eb19e60346858bfdbb494d9324252':
Fix DBus proxies to use all definitions
Christopher Wiley [Wed, 19 Aug 2015 21:39:28 +0000 (21:39 +0000)]
Merge "Fix DBus proxies to use all definitions"
Elliott Hughes [Wed, 19 Aug 2015 21:22:59 +0000 (14:22 -0700)]
Stop defining HAVE_MS_C_RUNTIME.
Change-Id: Ie491547552ba64d60d669b74115da96a0fcced18
Christopher Wiley [Wed, 19 Aug 2015 20:48:53 +0000 (13:48 -0700)]
Fix DBus proxies to use all definitions
Bug:
22608897
Change-Id: Id17cf4b896c1c62be874599c7f346f3045e36819
Christopher Wiley [Wed, 19 Aug 2015 18:37:48 +0000 (18:37 +0000)]
am
4d2b79f9: Merge "Generate DBus proxies and adaptors separately"
* commit '
4d2b79f99ef34a504fe9f7e362a861d7ddee5659':
Generate DBus proxies and adaptors separately
Christopher Wiley [Wed, 19 Aug 2015 18:30:20 +0000 (18:30 +0000)]
Merge "Generate DBus proxies and adaptors separately"
Christopher Wiley [Fri, 14 Aug 2015 21:55:32 +0000 (14:55 -0700)]
Generate DBus proxies and adaptors separately
Enable daemons exposing an interface over DBus to easily
build client libraries. Now daemons can write rules like:
include $(CLEAR_VARS)
LOCAL_MODULE := libdbus-binding-example-client
LOCAL_DBUS_PROXY_PREFIX := dbus-example-example
LOCAL_SRC_FILES := \
dbus_bindings/org.chromium.Example.Manager.dbus.xml \
dbus_bindings/dbus-service-config.json
include $(BUILD_SHARED_LIBRARY)
to expose a client library.
While here, add support for generating independent adaptor header
files on a per interface basis.
Bug:
22608897
Change-Id: I011f9afc234811c31e445898321c2731c482fa77
Tao Bao [Wed, 19 Aug 2015 02:39:21 +0000 (02:39 +0000)]
am
123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
* commit '
123a7d380ee29941639a1fce10ba2051d37f860b':
build: Don't call make_recovery_patch if there's no recovery.
Tao Bao [Wed, 19 Aug 2015 02:34:27 +0000 (02:34 +0000)]
Merge "build: Don't call make_recovery_patch if there's no recovery."
Tao Bao [Wed, 19 Aug 2015 01:03:56 +0000 (18:03 -0700)]
build: Don't call make_recovery_patch if there's no recovery.
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
Chih-hung Hsieh [Tue, 18 Aug 2015 22:17:31 +0000 (22:17 +0000)]
am
59c858fc: Merge "Remove special x86 flag that disables tail call optimization."
* commit '
59c858fc94d4cf45a260da81176372ca2a4b77ef':
Remove special x86 flag that disables tail call optimization.
Chih-hung Hsieh [Tue, 18 Aug 2015 22:11:03 +0000 (22:11 +0000)]
Merge "Remove special x86 flag that disables tail call optimization."
Ying Wang [Tue, 18 Aug 2015 21:41:05 +0000 (21:41 +0000)]
am
42fa1948: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
* commit '
42fa19482abbcebcb2ab563084b7ac1969553fe9':
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Ying Wang [Tue, 18 Aug 2015 21:41:03 +0000 (21:41 +0000)]
am
c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules."
* commit '
c3dcb6c06bd2fbe816a918e9c3b099669bbeb5b5':
Consolidate the nanopb-c and regular protobuf build rules.
Ying Wang [Tue, 18 Aug 2015 21:35:42 +0000 (21:35 +0000)]
Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
Ying Wang [Tue, 18 Aug 2015 21:35:37 +0000 (21:35 +0000)]
Merge "Consolidate the nanopb-c and regular protobuf build rules."
Ying Wang [Wed, 8 Apr 2015 16:54:34 +0000 (09:54 -0700)]
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Bug:
20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
Ying Wang [Tue, 7 Apr 2015 18:59:34 +0000 (11:59 -0700)]
Consolidate the nanopb-c and regular protobuf build rules.
Bug:
20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
Tao Bao [Tue, 18 Aug 2015 17:21:09 +0000 (17:21 +0000)]
am
ab9a3588: Merge "Revise stash for BBOTAs when needed."
* commit '
ab9a3588011ebe62eb18e425de02a50fe919b645':
Revise stash for BBOTAs when needed.
Tao Bao [Tue, 18 Aug 2015 16:59:05 +0000 (16:59 +0000)]
Merge "Revise stash for BBOTAs when needed."
Dan Willemsen [Tue, 18 Aug 2015 04:37:09 +0000 (04:37 +0000)]
am
05d97fe7: Merge "Remove legacy windows platform build support"
* commit '
05d97fe723ea376edb5fe6b12535485311a32418':
Remove legacy windows platform build support
Dan Willemsen [Tue, 18 Aug 2015 04:31:07 +0000 (04:31 +0000)]
Merge "Remove legacy windows platform build support"
Dan Willemsen [Tue, 18 Aug 2015 03:35:44 +0000 (03:35 +0000)]
am
e6510750: Merge "Use repeatable timestamps"
* commit '
e65107508adbea88fcc1ec51dcf28d4216365753':
Use repeatable timestamps
Dan Willemsen [Tue, 18 Aug 2015 03:30:11 +0000 (03:30 +0000)]
Merge "Use repeatable timestamps"
Ying Wang [Tue, 18 Aug 2015 00:11:11 +0000 (00:11 +0000)]
am
77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
* commit '
77128117d8b7811b86ba89e963f8a96cc6c55a6b':
Set up dependency on ADDRESS_SANITIZER_LINKER
Ying Wang [Tue, 18 Aug 2015 00:06:52 +0000 (00:06 +0000)]
Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
Ying Wang [Mon, 17 Aug 2015 23:13:24 +0000 (16:13 -0700)]
Set up dependency on ADDRESS_SANITIZER_LINKER
Set up dependency on ADDRESS_SANITIZER_LINKER if address sanitizer is
enabled.
Bug:
22850550
Change-Id: I736fe1d4db9594edf9e82ae96e4631887881dfa5
Dan Albert [Mon, 17 Aug 2015 22:39:25 +0000 (22:39 +0000)]
am
c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit '
c0018b04e984180122ab615d8dbea09a3230ef7f':
Add BUILD(_HOST)?_FUZZ_TEST.
Dan Albert [Mon, 17 Aug 2015 22:32:58 +0000 (22:32 +0000)]
Merge "Add BUILD(_HOST)?_FUZZ_TEST."
Dan Albert [Thu, 30 Jul 2015 23:56:30 +0000 (16:56 -0700)]
Add BUILD(_HOST)?_FUZZ_TEST.
These are tests that use LLVM's libFuzzer for testing with a
sanitizer.
Bug: http://b/
22850550
Change-Id: I6eeaff7877b7dd0c30f8910c6f27f5278b27a83d
Elliott Hughes [Mon, 17 Aug 2015 20:31:52 +0000 (20:31 +0000)]
am
648f2011: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
* commit '
648f2011a6fcf1fcb4a67b5d49a1c9d29877bc17':
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
Elliott Hughes [Mon, 17 Aug 2015 20:25:36 +0000 (20:25 +0000)]
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
Dan Albert [Mon, 17 Aug 2015 20:19:30 +0000 (20:19 +0000)]
am
f9b75b1b: Merge "Don\'t filter on a non-existent variable."
* commit '
f9b75b1b24d985c873e548d4fd7945a6cdd99323':
Don't filter on a non-existent variable.
Dan Albert [Mon, 17 Aug 2015 20:16:01 +0000 (20:16 +0000)]
Merge "Don't filter on a non-existent variable."
Elliott Hughes [Mon, 17 Aug 2015 19:37:37 +0000 (12:37 -0700)]
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
Change-Id: Iebca0c4eab975c4bebcd3658baefd85c51890db4
Dan Willemsen [Thu, 13 Aug 2015 21:31:36 +0000 (14:31 -0700)]
Remove legacy windows platform build support
We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.
Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
Tao Bao [Mon, 17 Aug 2015 17:48:43 +0000 (17:48 +0000)]
am
dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."
* commit '
dae6455c95a30ec2742b54ce3c8a4a45b1aa65f2':
Add an option to include a full bootloader in incremental OTA.
Tao Bao [Mon, 17 Aug 2015 17:38:01 +0000 (17:38 +0000)]
Merge "Add an option to include a full bootloader in incremental OTA."
Dan Albert [Mon, 17 Aug 2015 17:36:09 +0000 (10:36 -0700)]
Don't filter on a non-existent variable.
This used to be used for aarch64
(https://android-review.googlesource.com/#/c/80126/), but has since
been removed and now does nothing. This was then reimplemented more
generally with my_illegal_flags
(https://android-review.googlesource.com/#/c/166405/). Drop
*GLOBAL_UNSUPPORTED_CFLAGS in favor of that.
Change-Id: I3347726dd92f9d3a16783e0d9d3b685a828400b4
leozwang [Fri, 14 Aug 2015 17:57:58 +0000 (10:57 -0700)]
Add an option to include a full bootloader in incremental OTA.
Bug:
23101469
Change-Id: Iac466b83f789f10d26e8d289dce766cf0d05148b
(cherry picked from commit
c1324751e79b23a63ea494f4bc784446c8f32435)
Tao Bao [Mon, 17 Aug 2015 16:45:13 +0000 (09:45 -0700)]
Revise stash for BBOTAs when needed.
When generating incremental BBOTAs (v2 and above), we need to ensure
that the needed runtime stash is below the given threshold. If it's
running out of space on /cache, we replace the command that uses a
stash with a "new" command instead.
This may increase the OTA package size, since it is carrying more full
blocks instead of patches. It gets even worse for large files that span
a number of blocks, because currently we will store all the blocks for
the file as "new" blocks if stashing cannot be satisfied. We may further
optimize by splitting them into smaller chunks so that most of them can
still be stashed.
Bug:
22430577
Change-Id: I5a49e361adc7d3d41de2e9c08ee9b08c1e6c091a
Shinichiro Hamaji [Mon, 17 Aug 2015 08:41:29 +0000 (17:41 +0900)]
Add two flags for the latest ckati
* --regen
Re-generate build.ninja only when necessary. If either
1. .mk file is updated,
2. environment variable is updated,
3. $(wildcard) result is changed, or
4. $(shell) result is changed,
ckati will regenerate ninja file. This check takes only ~1
second, so incremental build will become much faster even
without "fastincremental" target.
* --ignore_dirty=out/%:
Some .mk files in out/ (e.g.,
out/target/product/generic/previous_build_config.mk)
are updated while ckati is running. With this flag, ckati
does not regenerate build.ninja when they look modified.
This should be OK for ninja based build, as ninja handles
command line changes nicely.
Change-Id: I7a2fca0e327d999599d6b16f06358e8a5e657565
Stephen Hines [Sat, 15 Aug 2015 02:12:46 +0000 (02:12 +0000)]
am
2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
* commit '
2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
Add -mfpu=neon-vfpv4 if cpu is krait
Stephen Hines [Sat, 15 Aug 2015 02:04:55 +0000 (02:04 +0000)]
Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
Yang Ni [Fri, 14 Aug 2015 18:46:18 +0000 (18:46 +0000)]
am
36600a6b: Merge "Include target api version in build system for rscpp."
* commit '
36600a6bf9b3b79327785cd740a909d3920d6519':
Include target api version in build system for rscpp.
Yang Ni [Fri, 14 Aug 2015 18:39:47 +0000 (18:39 +0000)]
Merge "Include target api version in build system for rscpp."
Dan Albert [Fri, 14 Aug 2015 01:05:03 +0000 (01:05 +0000)]
am
578acca4: Merge "Link librt on the host when using sanitizers."
* commit '
578acca4e27511900eefc2f65be3e88f9127660c':
Link librt on the host when using sanitizers.
Dan Albert [Fri, 14 Aug 2015 00:59:52 +0000 (00:59 +0000)]
Merge "Link librt on the host when using sanitizers."
Dan Albert [Fri, 14 Aug 2015 00:25:10 +0000 (17:25 -0700)]
Link librt on the host when using sanitizers.
The sanitizers now use shared memory.
Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
Noah Presler [Fri, 14 Aug 2015 00:04:10 +0000 (17:04 -0700)]
Include target api version in build system for rscpp.
b/
23161320
Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
Tao Bao [Thu, 13 Aug 2015 22:26:17 +0000 (22:26 +0000)]
am
8765fca2: Merge "Free the stash after its use in BBOTA v2."
* commit '
8765fca2f6013fe9d82ff00729089c98921bfb52':
Free the stash after its use in BBOTA v2.
Tao Bao [Thu, 13 Aug 2015 22:22:16 +0000 (22:22 +0000)]
Merge "Free the stash after its use in BBOTA v2."
Tao Bao [Thu, 13 Aug 2015 21:44:15 +0000 (14:44 -0700)]
Free the stash after its use in BBOTA v2.
In BBOTA v2, the stash size computation is inaccurate. A stash will be
used only once, so we deduct its size from stashed_blocks right after
its use. However, the stash doesn't actually get freed until being
overwritten by another stash or destroyed at the end of an update. This
leads to OTA failures due to insufficient space on /cache. This CL
changes the BBOTA v2 script to generate an explicit free right after
its use.
Bug:
23119955
Change-Id: Icdd8352bb0ff778945937c870990a888c7a4d38b
Dan Albert [Thu, 13 Aug 2015 16:52:55 +0000 (16:52 +0000)]
am
727b462a: Merge "Never allow -w."
* commit '
727b462a92635665ce636c63123078a970654480':
Never allow -w.
Dan Albert [Thu, 13 Aug 2015 16:48:18 +0000 (16:48 +0000)]
Merge "Never allow -w."
Neil Fuller [Thu, 13 Aug 2015 10:46:46 +0000 (10:46 +0000)]
am
bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '
bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
Include the okhttp.jar when compiling against internal classes
Neil Fuller [Thu, 13 Aug 2015 10:40:39 +0000 (10:40 +0000)]
Merge "Include the okhttp.jar when compiling against internal classes"
Nick Kralevich [Wed, 12 Aug 2015 23:53:50 +0000 (23:53 +0000)]
am
5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit '
5f79bcdd070f4069cd60bbe68430ee172575f9e2':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
Nick Kralevich [Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)]
Merge changes from topic 'file_contexts.bin'
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
Dan Albert [Wed, 12 Aug 2015 21:54:16 +0000 (14:54 -0700)]
Never allow -w.
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.
Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
Neil Fuller [Tue, 11 Aug 2015 12:48:34 +0000 (13:48 +0100)]
Include the okhttp.jar when compiling against internal classes
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.
okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.
The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.
This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.
Bug:
23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
Dan Willemsen [Tue, 11 Aug 2015 22:25:12 +0000 (15:25 -0700)]
Use repeatable timestamps
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug:
23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
Gina Dimino [Wed, 12 Aug 2015 03:14:01 +0000 (03:14 +0000)]
am
8f301ff1: Merge "Docs: Rename content-footer-text plus remove whitespace."
* commit '
8f301ff10d037e4305775c55ce9be6fcb93a8134':
Docs: Rename content-footer-text plus remove whitespace.
Gina Dimino [Wed, 12 Aug 2015 03:05:59 +0000 (03:05 +0000)]
Merge "Docs: Rename content-footer-text plus remove whitespace."
Dan Willemsen [Wed, 12 Aug 2015 01:07:44 +0000 (01:07 +0000)]
am
608aa91d: Merge "Revert "Use repeatable timestamps""
* commit '
608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
Revert "Use repeatable timestamps"
Dan Willemsen [Wed, 12 Aug 2015 01:02:19 +0000 (01:02 +0000)]
Merge "Revert "Use repeatable timestamps""
Dan Willemsen [Wed, 12 Aug 2015 01:00:19 +0000 (01:00 +0000)]
Revert "Use repeatable timestamps"
OSX `date` doesn't understand -d
This reverts commit
13ba6e00f4c7e04f1038e94ab98e3ed424daa4fa.
Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
Dan Willemsen [Wed, 12 Aug 2015 00:55:21 +0000 (00:55 +0000)]
am
671b8ff5: Merge "Use repeatable timestamps"
* commit '
671b8ff5457472631f805f3230273e5e8121b28a':
Use repeatable timestamps
Dan Willemsen [Wed, 12 Aug 2015 00:49:26 +0000 (00:49 +0000)]
Merge "Use repeatable timestamps"
Dan Willemsen [Tue, 11 Aug 2015 22:25:12 +0000 (15:25 -0700)]
Use repeatable timestamps
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug:
23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
Ying Wang [Tue, 11 Aug 2015 23:14:52 +0000 (23:14 +0000)]
am
20febe3d: Merge "Don\'t build otapackage on Mac."
* commit '
20febe3d839131e2cde795ae2a36f93c5ac1c378':
Don't build otapackage on Mac.
Ying Wang [Tue, 11 Aug 2015 22:49:25 +0000 (22:49 +0000)]
Merge "Don't build otapackage on Mac."
Ying Wang [Tue, 11 Aug 2015 18:24:19 +0000 (11:24 -0700)]
Don't build otapackage on Mac.
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.
Bug:
23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
Ying Wang [Mon, 10 Aug 2015 22:23:10 +0000 (22:23 +0000)]
am
edf7bf8d: Merge "Allow custom recovery resource dirs."
* commit '
edf7bf8d832fdd2356cb68519b8e717acde94e5b':
Allow custom recovery resource dirs.
Ying Wang [Mon, 10 Aug 2015 22:15:23 +0000 (22:15 +0000)]
Merge "Allow custom recovery resource dirs."