Commit graph

19285 commits

Author SHA1 Message Date
Yohann Roussel
368a6f44a9 am 182ac4e3: Merge "Stubs of android-support-multidex-instrumentation."
* commit '182ac4e3fd5bf9397bf5f8397e2cc599e761e16b':
  Stubs of android-support-multidex-instrumentation.
2014-07-18 10:55:06 +00:00
Yohann Roussel
189f95221c am 2d3e4d22: Merge "Generates SDK stubs of android-support-multidex"
* commit '2d3e4d22d9a97837a1545a563c5d2e7e4b915040':
  Generates SDK stubs of android-support-multidex
2014-07-18 10:55:05 +00:00
Yohann Roussel
9b457ea066 am 34ba2331: Merge "Support dx generating multiple dex files."
* commit '34ba2331f7caec3dc5df97024fa8bf57c9e5d045':
  Support dx generating multiple dex files.
2014-07-18 10:55:05 +00:00
Ying Wang
2282df385d am 3e72ed17: Fail build if non-symlink /system/vendor detected while we are building
* commit '3e72ed17a557d0db6733ca6cba1f36e85f57460d':
  Fail build if non-symlink /system/vendor detected while we are building
2014-07-17 23:47:39 +00:00
Yohann Roussel
1029013a0d Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex" 2014-07-17 22:39:21 +00:00
Yohann Roussel
182ac4e3fd Merge "Stubs of android-support-multidex-instrumentation." 2014-07-17 22:37:43 +00:00
Yohann Roussel
d5389ba416 Merge "Move multidex support library" 2014-07-17 22:36:58 +00:00
Yohann Roussel
2d3e4d22d9 Merge "Generates SDK stubs of android-support-multidex" 2014-07-17 22:36:58 +00:00
Yohann Roussel
34ba2331f7 Merge "Support dx generating multiple dex files." 2014-07-17 22:36:58 +00:00
Ying Wang
5a5aa71f6c Merge "New installation path for apks and their JNIs." into lmp-dev 2014-07-17 21:58:28 +00:00
Ying Wang
af9757e849 New installation path for apks and their JNIs.
Apk's path is changed to <parent_dir>/MyApp/MyApp.apk;
JNI path is changed to <parent_dir>/MyApp/lib/<arch_name>/libfoo.so.
Symlinks of JNIs are changed accordingly.

Bug: 16319961
Change-Id: Ib3b2309c95fa9aea27837fcc29e28d990b04747b
2014-07-18 16:26:24 -07:00
Ying Wang
06940df713 resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aosp
Change-Id: I5551e6b1303f2b37d199a1b894f37c50839fdecc
2014-07-17 14:51:13 -07:00
Ying Wang
ef44fb2d7b am 0b30c5f0: Merge "Remove linker64 and debuggerd64"
* commit '0b30c5f0b5d70ecc7599f33ccd226f62e176872f':
  Remove linker64 and debuggerd64
2014-07-17 21:13:55 +00:00
Ying Wang
3e72ed17a5 Fail build if non-symlink /system/vendor detected while we are building
Fail build if non-symlink /system/vendor detected while we are building
a separate vendor.img.

Bug: 16360411
Change-Id: I96cb6d0b654d6632cd820ba193423e9a16214638
2014-07-17 13:00:20 -07:00
Sebastien Hertz
3389b9e887 Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-dev 2014-07-17 19:51:18 +00:00
Ian Rogers
bb6593243f Vary non-image Xmx for dex2oat on MIPS.
The image Xmx is already fixed at 64m. The issue is in the non boot image case.

(cherry picked from commit 87f0d006f2)

Change-Id: Id4a6d9e8edf00505198c3f3dd599cb7b7f06363a
2014-07-22 18:36:25 +02:00
Sebastien Hertz
2715dc678a Merge "Fix the MIPS build." into lmp-dev 2014-07-17 19:51:18 +00:00
Ian Rogers
16de128da1 Fix the MIPS build.
Use an override for the dex2oat Xmx value when cross-compiling.
Bug: 16221224

(cherry picked from commit 7d70f830bc)

Change-Id: Ic13b471c74325e8145a0a9c93a417355505e484a
2014-07-22 09:46:37 +02:00
Ying Wang
0b30c5f0b5 Merge "Remove linker64 and debuggerd64" 2014-07-17 18:15:27 +00:00
Ying Wang
b2be5ffded Remove linker64 and debuggerd64
We don't have separate *64 module names any more.
Now both 32-bit and 64-bit variants are built under the same module name.

Change-Id: I1956a6a88ec6fe280798be01928239d098dfe27a
2014-07-17 14:01:12 -07:00
Nick Kralevich
1756474d87 Merge "runhat: use /data/local/tmp" into lmp-dev 2014-07-17 17:59:02 +00:00
Nick Kralevich
9948b1e9ed runhat: use /data/local/tmp
Use /data/local/tmp for runhat reports, instead of the sdcard.
system_server isn't allowed to handle sdcard file descriptors, since
the sdcard could be ejected at any time, causing the kernel to kill the
system process.

This addresses the following SELinux denial:

  W/main    ( 9906): type=1400 audit(0.0:16): avc: denied { read write } for path="/mnt/shell/emulated/0/hprof-600" dev="fuse" ino=3077890536 scontext=u:r:system_server:s0 tcontext=u:object_r:fuse:s0 tclass=file

Bug: 16375996
Change-Id: I4c2053c327526c2f8e6812f4ed911a712ae9a9b8
2014-07-18 15:45:38 -07:00
Ying Wang
f551abc4fc am cff38625: Include vendor.img in PDK build.
* commit 'cff386250f822f32b488d0632ef1936065df7650':
  Include vendor.img in PDK build.
2014-07-17 17:06:21 +00:00
Joe LaPenna
0c8ca7d8b5 am 683d9867: Merge "Add tvdpi to list of possible recovery asset densities" into lmp-dev
* commit '683d9867b54aea2402a569455da52fb174f39073':
  Add tvdpi to list of possible recovery asset densities
2014-07-17 17:00:15 +00:00
Yohann Roussel
100aba5374 Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
This keeps only the real sources in doc target and fixes some error
messages caused by trying to generate docs of the tests.

Change-Id: Icd6903a43c90efc08eba92976dddb104c45a5e43
2014-07-17 17:20:03 +02:00
Ian Rogers
65256fd3e8 am fab98ef6: am bc30611f: Merge "Vary non-image Xmx for dex2oat on MIPS."
* commit 'fab98ef6d4398a394f10f764c5dc0f42e2792d65':
  Vary non-image Xmx for dex2oat on MIPS.
2014-07-17 13:00:55 +00:00
Ying Wang
7050d218c9 am 7d50394b: am e1caecfa: Merge "Fix the MIPS build."
* commit '7d50394bd76ebbcfffcf5e8fff0f23bd35459a0d':
  Fix the MIPS build.
2014-07-17 13:00:54 +00:00
Ian Rogers
fab98ef6d4 am bc30611f: Merge "Vary non-image Xmx for dex2oat on MIPS."
* commit 'bc30611f8e08361a41c7e78c799732a7f685e568':
  Vary non-image Xmx for dex2oat on MIPS.
2014-07-17 12:30:33 +00:00
Ying Wang
7d50394bd7 am e1caecfa: Merge "Fix the MIPS build."
* commit 'e1caecfaa2c9b5165e5a0f31faac1b983b5d128a':
  Fix the MIPS build.
2014-07-17 12:30:31 +00:00
Ying Wang
cff386250f Include vendor.img in PDK build.
- Add the stuff in /vendor to platform.zip.
- Pull things of vendor.img from platform.zip when doing PDK fusion
  build.

Bug: 16354024
Change-Id: I4f3fd392af8c357a5614b3e26ceac15fd3e6a0d0
2014-07-16 17:46:35 -07:00
Ian Rogers
bc30611f8e Merge "Vary non-image Xmx for dex2oat on MIPS." 2014-07-16 23:43:15 +00:00
Ian Rogers
87f0d006f2 Vary non-image Xmx for dex2oat on MIPS.
The image Xmx is already fixed at 64m. The issue is in the non boot image case.

Change-Id: Idd508187ce8ac3d3c8dbe357c74bc33a5c8185dd
2014-07-16 22:25:35 -07:00
Ying Wang
e1caecfaa2 Merge "Fix the MIPS build." 2014-07-16 23:31:38 +00:00
Ian Rogers
7d70f830bc Fix the MIPS build.
Use an override for the dex2oat Xmx value when cross-compiling.
Bug: 16221224

Change-Id: Iaeac95cd50a0bae7817ee7da23b3cf25246f1d6d
2014-07-16 18:06:02 -07:00
Maurice Chu
4cb1d0956d Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829
2014-07-16 19:39:11 +02:00
David Friedman
05173bf9e6 am ba6dc727: am 93848788: am 81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
* commit 'ba6dc7272c11ba00111fa897dc937db9745a76f4':
  Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:54:43 +00:00
David Friedman
ba6dc7272c am 93848788: am 81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
* commit '9384878820ec7c881fdf054e8a0a88b2d1b94f64':
  Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:36:20 +00:00
David Friedman
9384878820 am 81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
* commit '81415adad38fe06f50f381d6317ca0b93848e095':
  Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:29:09 +00:00
Joe LaPenna
683d9867b5 Merge "Add tvdpi to list of possible recovery asset densities" into lmp-dev 2014-07-16 13:12:22 +00:00
Yohann Roussel
06fe5d1aef Stubs of android-support-multidex-instrumentation.
For the SDK.

(cherry picked from commit 584f601910)

Change-Id: I64b7d279a575c201c4df52a6bd3caa75baf58d11
2014-07-16 12:45:13 +02:00
Yohann Roussel
10713dcece Generates SDK stubs of android-support-multidex
(cherry picked from commit c4441b8c37)

Conflicts:
        core/pathmap.mk

Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f
2014-07-16 12:43:36 +02:00
Yohann Roussel
e019dfd721 Support dx generating multiple dex files.
Dx is now capable of generating multiple dex file in one run.
This capability is not compatible with --output=*.dex so this CL
changes the --output argument to be a directory. This CL also
includes the packaging of the multiple dex files when dx generates
more than one dex file.

(cherry picked from commit 8ffe9c3e79)

Conflicts:
        core/java.mk

Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
2014-07-16 12:38:22 +02:00
Deepanshu Gupta
c5aa35c4a4 am 9c5564e0: Fix incremental builds for SDK.
* commit '9c5564e060b019d154b07fca3513443039266145':
  Fix incremental builds for SDK.
2014-07-16 00:45:02 +00:00
Deepanshu Gupta
9c5564e060 Fix incremental builds for SDK.
Atree used to output files without escaping the filenames. This resulted
in breaks for incremental builds when filenames contained '$' symbol.
The change fixes this by escaping the filename properly.

Change-Id: I957787b1b3536c64ba6fcb5b4bb5fc60e8b04452
2014-07-15 17:26:56 -07:00
Joe LaPenna
792ab6cd24 Add tvdpi to list of possible recovery asset densities
Bug: 16306251

Change-Id: Iaf2d36d734bb6b639b01e1097723d8387259265b
2014-07-15 16:51:44 -07:00
David Friedman
81415adad3 Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
Change-Id: I33af76d23035067ed740d2bf734708aca8dcffe2
2014-07-15 11:38:40 -07:00
Ed Heyl
7b03930ddf am f6771f63: reconcile aosp (8689b90bcf) after branching. Please do not merge.
* commit 'f6771f631b814189d83b9b16cfa73d1466f932af':
  reconcile aosp (8689b90bcf) after branching. Please do not merge.
2014-07-15 17:01:35 +00:00
Ed Heyl
f6771f631b reconcile aosp (8689b90bcf) after branching. Please do not merge.
Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
2014-07-14 23:32:28 -07:00
Guang Zhu
6d1f9232f8 am 4f892ab7: DO NOT MERGE: Change build id to LMP
* commit '4f892ab728798dab39812e2dcf38bec5b2a112ea':
  DO NOT MERGE: Change build id to LMP
2014-07-15 03:04:48 +00:00
Guang Zhu
4f892ab728 DO NOT MERGE: Change build id to LMP
Change-Id: Ic52925bb3f01c5d3f6560f6c9d7a8f4c58500101
2014-07-15 02:45:43 +00:00