Narayan Kamath
0e4cccbff6
am a8dcc8c8
: am fe57f665
: Merge "A few more Java7 related clean ups."
...
* commit 'a8dcc8c81a567902bee69a8dcd7357d391ef39b9':
A few more Java7 related clean ups.
2013-12-06 09:16:18 -08:00
Narayan Kamath
99bb0365d5
am 948206c0
: Merge "Fix tools path on Mac OS for java 7."
...
* commit '948206c026c8751b9d53341dfe9c2c2905ebb002':
Fix tools path on Mac OS for java 7.
2013-12-06 09:13:58 -08:00
Narayan Kamath
a8dcc8c81a
am fe57f665
: Merge "A few more Java7 related clean ups."
...
* commit 'fe57f665074665edf469ad1e1d0fcef749f9a5bb':
A few more Java7 related clean ups.
2013-12-06 09:13:58 -08:00
Narayan Kamath
948206c026
Merge "Fix tools path on Mac OS for java 7."
2013-12-06 17:11:08 +00:00
Narayan Kamath
fe57f66507
Merge "A few more Java7 related clean ups."
2013-12-06 17:10:53 +00:00
The Android Open Source Project
5e398801fd
am e67167f6
: am 8e9369f3
: am 722581a5
: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD
...
* commit 'e67167f62e59e4be783d97e5f29e85b2fb813176':
2013-12-06 01:38:48 +00:00
Geremy Condra
0f9de4f39e
Merge "Fix unsparse image reuse bug."
2013-12-06 01:38:14 +00:00
The Android Open Source Project
e67167f62e
am 8e9369f3
: am 722581a5
: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD
...
* commit '8e9369f3c2324aa0ee385ab7bffc10dbd590e5bb':
2013-12-06 01:30:15 +00:00
The Android Open Source Project
8e9369f3c2
am 722581a5
: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD
...
* commit '722581a59873a98d30f7af34300049d524c1783f':
2013-12-05 17:24:53 -08:00
Geremy Condra
6e8f53c276
Fix unsparse image reuse bug.
...
This would cause an existing sparse image to be reused by a
subsequent build, leading to verity failures.
Change-Id: I2082df3dfba014515c9267e02189fe9987a56830
2013-12-05 17:09:18 -08:00
Doug Zongker
850b80780d
fix timestamps in images to the build date
...
Pass the -T option to mkuserimg.sh to set all timestamps in the system
image (and any other ext4 image we build) to the value of
ro.build.date.utc for the build. This makes images produced from a
given target_files bit-identical.
Change-Id: Ibba5fa7a610f476209ef61708729cfd79dece0b6
2013-12-05 15:54:55 -08:00
Ying Wang
9315bf6b73
am dd3f2e07
: (-s ours) am 5a7a1041
: am ad7fd29b
: Don\'t bother going through the source tree
...
* commit 'dd3f2e07aec719c286d4944c1526515e82830be3':
2013-12-05 22:50:08 +00:00
Ying Wang
c79d5124ee
am efad259b
: (-s ours) am 6d805753
: am 01c17f03
: am e58868ab
: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
...
* commit 'efad259b8c9fa73403f070a10e0b1433fdc1a681':
2013-12-05 22:50:07 +00:00
Ying Wang
589cf893dc
am 50234e5d
: (-s ours) am 412bc232
: am 0a7e26e2
: am a3f69c93
: Merge "Modify release tools to replace certs in MMAC files."
...
* commit '50234e5d5792bed8c0aaf82384ecec5d81053c57':
2013-12-05 22:50:06 +00:00
Ying Wang
155f286576
am c6e09b98
: (-s ours) am 0790dcfd
: am 2e45116d
: am 515e0465
: Merge "FDO: do not support host modules"
...
* commit 'c6e09b9890921c0221aa5fabf34f412de9e41927':
2013-12-05 22:50:05 +00:00
Alex Ray
2cd694bf62
am 57891b91
: (-s ours) DO NOT MERGE: tiny: generic product configs for super-low-mem devices
...
* commit '57891b91efca5b2c49fa14f79f4cc06824e43b8c':
DO NOT MERGE: tiny: generic product configs for super-low-mem devices
2013-12-05 22:28:33 +00:00
The Android Open Source Project
722581a598
Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
...
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
2013-12-05 12:59:39 -08:00
Ying Wang
e64a7058c9
am 48feb167
: am a395c6c1
: am 18ee9e5e
: Merge "Push wpa_supplicant modules down to the leaf product config."
...
* commit '48feb167d5064be1f12e856217d3f4358f324486':
Push wpa_supplicant modules down to the leaf product config.
2013-12-05 20:41:02 +00:00
Ying Wang
57ad920e60
am d4e33c96
: am 730511d9
: am 3bd3693d
: Merge "Delete board config for the unused "emulator" device."
...
* commit 'd4e33c960ba8f1fa69d64f6c585ec8f874595d52':
Delete board config for the unused "emulator" device.
2013-12-05 20:41:01 +00:00
Ying Wang
3e0ee80b53
am 41e5c401
: am 404f32d1
: am 1caa938a
: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
...
* commit '41e5c4010627cd286f3e74697cb0e2792c357fea':
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 20:41:00 +00:00
Ying Wang
48feb167d5
am a395c6c1
: am 18ee9e5e
: Merge "Push wpa_supplicant modules down to the leaf product config."
...
* commit 'a395c6c1e424c7e5586dcc71d9df6d036aa0c3be':
Push wpa_supplicant modules down to the leaf product config.
2013-12-05 20:33:37 +00:00
Ying Wang
d4e33c960b
am 730511d9
: am 3bd3693d
: Merge "Delete board config for the unused "emulator" device."
...
* commit '730511d9c4450b20eb2bc8d47d049ee3dbd982b1':
Delete board config for the unused "emulator" device.
2013-12-05 20:33:37 +00:00
Ying Wang
41e5c40106
am 404f32d1
: am 1caa938a
: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
...
* commit '404f32d120dffc04ca19c1cc84c2491ef249764a':
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 20:33:36 +00:00
Ying Wang
a395c6c1e4
am 18ee9e5e
: Merge "Push wpa_supplicant modules down to the leaf product config."
...
* commit '18ee9e5e7de08933a04137e560bff87b113adb21':
Push wpa_supplicant modules down to the leaf product config.
2013-12-05 12:25:33 -08:00
Ying Wang
730511d9c4
am 3bd3693d
: Merge "Delete board config for the unused "emulator" device."
...
* commit '3bd3693dd0a0b514d6b1e9cbce052dee1940166b':
Delete board config for the unused "emulator" device.
2013-12-05 12:25:32 -08:00
Ying Wang
404f32d120
am 1caa938a
: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
...
* commit '1caa938a22606a55103318df82a31a92f47900da':
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 12:25:31 -08:00
Ying Wang
dd3f2e07ae
am 5a7a1041
: am ad7fd29b
: Don\'t bother going through the source tree
...
* commit '5a7a10411c9769dcd1f5ac2c6947cccb28424a50':
2013-12-05 19:40:16 +00:00
Ying Wang
efad259b8c
am 6d805753
: am 01c17f03
: am e58868ab
: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
...
* commit '6d805753d9c9bc755280fdc05e0bcdf3fcee2f00':
Link PRIVATE_TARGET_FDO_LIB before shared libraries
2013-12-05 19:38:13 +00:00
Ying Wang
50234e5d57
am 412bc232
: am 0a7e26e2
: am a3f69c93
: Merge "Modify release tools to replace certs in MMAC files."
...
* commit '412bc2329f788bbbc28e198cec45c82bd2fa0a50':
Modify release tools to replace certs in MMAC files.
2013-12-05 19:38:12 +00:00
Ying Wang
c6e09b9890
am 0790dcfd
: am 2e45116d
: am 515e0465
: Merge "FDO: do not support host modules"
...
* commit '0790dcfd3b52a16dccc118577bf154c83162bec1':
FDO: do not support host modules
2013-12-05 19:38:11 +00:00
Ying Wang
18ee9e5e7d
Merge "Push wpa_supplicant modules down to the leaf product config."
2013-12-05 19:14:20 +00:00
Ying Wang
3bd3693dd0
Merge "Delete board config for the unused "emulator" device."
2013-12-05 19:14:11 +00:00
Ying Wang
1caa938a22
Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
2013-12-05 19:14:01 +00:00
Ying Wang
8efd05b5d9
am 9eaf1477
: am 2d76eae8
: am c404d342
: am 7493c39e
: Add utility function find-files-in-subdirs
...
* commit '9eaf1477cf55182df1783e8b2b0be4efd4fbece8':
Add utility function find-files-in-subdirs
2013-12-05 18:50:09 +00:00
Ying Wang
9eaf1477cf
am 2d76eae8
: am c404d342
: am 7493c39e
: Add utility function find-files-in-subdirs
...
* commit '2d76eae8270eb992bd70e723b7ed42af85cc2fe9':
Add utility function find-files-in-subdirs
2013-12-05 18:47:28 +00:00
Ying Wang
2d76eae827
am c404d342
: am 7493c39e
: Add utility function find-files-in-subdirs
...
* commit 'c404d34282cabb3b9818cbf8020af18797ce8c6f':
Add utility function find-files-in-subdirs
2013-12-05 10:43:51 -08:00
Ying Wang
c404d34282
am 7493c39e
: Add utility function find-files-in-subdirs
...
* commit '7493c39eff203ed027b0f0ea320c26dd7d895b22':
Add utility function find-files-in-subdirs
2013-12-05 10:39:42 -08:00
Ying Wang
7493c39eff
Add utility function find-files-in-subdirs
...
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.
Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
(cherry picked from commit 85898bca99
)
2013-12-05 18:37:20 +00:00
Ying Wang
17fc3d2ac1
Push wpa_supplicant modules down to the leaf product config.
...
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.
Actually the generic devices don't need them.
Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f
Conflicts:
target/product/core_tiny.mk
2013-12-05 10:12:01 -08:00
Ying Wang
817d803c65
Delete board config for the unused "emulator" device.
...
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
2013-12-05 10:08:10 -08:00
Ying Wang
ab6b4e0e22
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
...
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.
Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
2013-12-05 10:07:38 -08:00
Narayan Kamath
ab2e2e792e
Fix tools path on Mac OS for java 7.
...
Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
2013-12-05 17:56:23 +00:00
Ying Wang
c7ad1453f3
am 8df06ce0
: am e2d5b777
: am e65c2969
: Merge "Add utility function find-files-in-subdirs"
...
* commit '8df06ce0faf2ef3b475a71b4a48f4bbc0b4f407c':
Add utility function find-files-in-subdirs
2013-12-05 14:26:57 +00:00
Ying Wang
8df06ce0fa
am e2d5b777
: am e65c2969
: Merge "Add utility function find-files-in-subdirs"
...
* commit 'e2d5b7772b0d4de8220f08e35430ea1bba3a9fcc':
Add utility function find-files-in-subdirs
2013-12-05 14:24:43 +00:00
Ying Wang
e2d5b7772b
am e65c2969
: Merge "Add utility function find-files-in-subdirs"
...
* commit 'e65c29697ac2cad422a094720944d326128f17c3':
Add utility function find-files-in-subdirs
2013-12-05 06:22:37 -08:00
Narayan Kamath
e2d27887be
A few more Java7 related clean ups.
...
- Separate SDK checking from version checking and
make messages clearer.
- Add explicit source & target versions for javac to
make things clearer.
- Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to
EXPERIMENTAL_USE_JAVA7.
- Allow Oracle JDK 1.7 to be used on Mac OS, since there's
no official OpenJDK support for that platform.
Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
2013-12-05 13:23:06 +00:00
Ying Wang
51ff3d6eca
Merge "resolved conflicts for merge of 9c7281fb
to master"
2013-12-05 02:43:18 +00:00
Xavier Ducrohet
c1bb0c774a
resolved conflicts for merge of 9c7281fb
to master
...
Change-Id: Ibbcb5cdc46d6d7e1a5bf12d090717f11b26b7308
2013-12-04 18:41:24 -08:00
Ying Wang
e65c29697a
Merge "Add utility function find-files-in-subdirs"
2013-12-05 02:40:32 +00:00
Ying Wang
7c8c7bd4b6
Add utility function find-files-in-subdirs
...
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.
Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
2013-12-04 16:56:38 -08:00