James Dong
a69e6194da
Build libstagefright_soft_mpeg4enc.so by default
...
o related-to-bug: 6401068
Change-Id: I3114d4b817acc85a6982d03ef3b161141413a079
2012-04-25 18:10:19 -07:00
James Dong
a56be342c2
Merge "Build libstagefright_soft_h264enc by default"
2012-04-24 18:02:49 -07:00
Ying Wang
64f642d688
Fix pdk build.
...
The pdk builds don't have access to development.
Change-Id: Ie7e9f8d24b788749481465311e64145e175b8c4f
2012-04-24 17:12:43 -07:00
Raphael Moll
b7567ea321
resolved conflicts for merge of 4a6e8b95
to master
...
Change-Id: I04abdad12266d7f0eb248528d9bbd35369d18413
2012-04-24 15:43:28 -07:00
The Android Open Source Project
9a7ba63c05
am 30a6d7e3
: am 76f57fe3
: Reconcile with ics-mr1-release
...
* commit '30a6d7e3e5904c2e0a833a2adef83db6cd54e9ba':
IMM76K
IMM76J
IMM76I
IMM76H
IMM76G
IMM76F
IMM76E
2012-04-24 15:19:29 -07:00
Jean-Baptiste Queru
d8f9aed6e6
am 80879a6e
: (-s ours) am 695a2b3f
: am 9b16b129
: Merge "Switch to new locations of toolchains"
...
* commit '80879a6ea4be133c222911055d83e3e43dc15be5':
Switch to new locations of toolchains
2012-04-24 14:54:15 -07:00
Jean-Baptiste Queru
0cfde4016d
Merge 8664008c
to master
...
Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
2012-04-24 14:47:45 -07:00
Jean-Baptiste Queru
26e4e8c047
am 77df1f2a
: am 9987dbbb
: am d0427e49
: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
...
* commit '77df1f2aeceaeabfc058a1938b672fe02a4fed93':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
2012-04-24 14:31:31 -07:00
Jean-Baptiste Queru
73e6923ed2
am 7ed999aa
: (-s ours) am c4aa4ff3
: am 810b0d8b
: Merge "Fix build problems with gcc-4.6.x."
...
* commit '7ed999aaf00a71d99975a4a068ba2562c0aabc88':
Fix build problems with gcc-4.6.x.
2012-04-24 14:31:25 -07:00
Scott Main
d5d2da1276
am 4054a158
: am 7a086316
: am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '4054a1587a878d2c5f9dc64433bf7ae8ebbe6bd3':
2012-04-24 14:27:31 -07:00
Scott Main
16a34c2b5a
am 217a4d89
: am 9041aa50
: am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '217a4d896b9bd5bd91cccc8077f7ebd353538f7b':
2012-04-24 14:27:30 -07:00
James Dong
d5177950a5
Build libstagefright_soft_h264enc by default
...
related-to-bug: 6383440
Change-Id: I852941c72f9b7270ac6e5b094e4b2a0322643ac8
2012-04-24 14:02:25 -07:00
Scott Main
ebf37aa826
am f689b77c
: am b3d8eecd
: am 76b0139a
: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit 'f689b77c0519f1c73006d55d8ca3ed35bfb64ad1':
2012-04-24 13:58:00 -07:00
Scott Main
aa4d4b9861
am 7291a4f7
: am 27e53840
: am 76b0139a
: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit '7291a4f78408651d78a8ff05eda22ce3805603dd':
2012-04-24 13:57:59 -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
Raphael Moll
4a6e8b95e3
am c094c0a6
: am d0831659
: Merge "Split target/product/sdk.mk into sdk.git"
...
* commit 'c094c0a68fe311ea671b4c95756d300bc6a540f4':
Split target/product/sdk.mk into sdk.git
2012-04-23 15:47:39 -07:00
Raphael Moll
c094c0a68f
am d0831659
: Merge "Split target/product/sdk.mk into sdk.git"
...
* commit 'd0831659af544b93f3a9592a1cd4f85ff89e8635':
Split target/product/sdk.mk into sdk.git
2012-04-23 15:43:35 -07:00
The Android Open Source Project
30a6d7e3e5
am 76f57fe3
: Reconcile with ics-mr1-release
...
* commit '76f57fe3737a5f88c536f3fe936f2343bbe3b1f3':
IMM76K
IMM76J
IMM76I
IMM76H
IMM76G
IMM76F
IMM76E
2012-04-23 14:42:27 -07:00
The Android Open Source Project
76f57fe373
Reconcile with ics-mr1-release
...
Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
2012-04-23 14:40:15 -07:00
Raphael Moll
d0831659af
Merge "Split target/product/sdk.mk into sdk.git"
2012-04-23 12:44:00 -07:00
Jean-Baptiste Queru
80879a6ea4
am 695a2b3f
: am 9b16b129
: Merge "Switch to new locations of toolchains"
...
* commit '695a2b3fd9b68f45b6fa1065c1254f88318dd4ca':
Switch to new locations of toolchains
2012-04-23 09:25:59 -07:00
Jean-Baptiste Queru
695a2b3fd9
am 9b16b129
: Merge "Switch to new locations of toolchains"
...
* commit '9b16b1293255be054a84e6f39098c7a35357f636':
Switch to new locations of toolchains
2012-04-23 09:23:58 -07:00
Jean-Baptiste Queru
9b16b12932
Merge "Switch to new locations of toolchains"
2012-04-23 08:31:53 -07:00
Andrew Hsieh
8664008cdd
am acd812d6
: am 11e0192d
: Merge "Add goldfish audio hw to board/generic_x86"
...
* commit 'acd812d6a7bce9fd44e2b5974b93c542754f78d6':
Add goldfish audio hw to board/generic_x86
2012-04-21 00:54:42 -07:00
Andrew Hsieh
acd812d6a7
am 11e0192d
: Merge "Add goldfish audio hw to board/generic_x86"
...
* commit '11e0192d29459aab8f3acebaae113eece492069f':
Add goldfish audio hw to board/generic_x86
2012-04-21 00:52:28 -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
Andrew Hsieh
11e0192d29
Merge "Add goldfish audio hw to board/generic_x86"
2012-04-20 16:52:27 -07:00
Jean-Baptiste Queru
77df1f2aec
am 9987dbbb
: am d0427e49
: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
...
* commit '9987dbbbb43ca3279ec615299fbab8a9101aa51c':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
2012-04-20 16:45:51 -07:00
Jean-Baptiste Queru
7ed999aaf0
am c4aa4ff3
: am 810b0d8b
: Merge "Fix build problems with gcc-4.6.x."
...
* commit 'c4aa4ff3551873c2e87a8679994d1f41f9909b0b':
Fix build problems with gcc-4.6.x.
2012-04-20 16:45:49 -07:00
Jean-Baptiste Queru
9987dbbbb4
am d0427e49
: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
...
* commit 'd0427e493edf2e4de2bd60fd1cc8253e9de233fd':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
2012-04-20 16:43:25 -07:00
Jean-Baptiste Queru
c4aa4ff355
am 810b0d8b
: Merge "Fix build problems with gcc-4.6.x."
...
* commit '810b0d8bb4a458c5a92c0bed48b75cbf27f1410d':
Fix build problems with gcc-4.6.x.
2012-04-20 16:43:23 -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
The Android Automerger
b0936b79fa
IMM76K
2012-04-20 16:20:26 -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
Jean-Baptiste Queru
a50ef1c124
Switch to new locations of toolchains
...
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
2012-04-20 16:15:42 -07:00
Colin Cross
d71a7f7bc8
Merge "Move pdk fusion platform.zip file under vendor/pdk"
2012-04-20 15:44:29 -07:00
Raphael Moll
f66f3476e4
Split target/product/sdk.mk into sdk.git
...
This changes target/product/sdk.mk so that the list of tools
and libs to build for the SDK be actually defined in both
sdk.git and development.git.
Depends on dev.git change I6bbc6644a and sdk.git change Id270eba6
Change-Id: I790df85ea8620f73c769aec0f92f474de60b63f9
2012-04-20 14:14:55 -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
Scott Main
e8e50739da
am ac2c989e
: am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit 'ac2c989e8492a733bdd3d4c7e1bedd5210c56c8d':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:38:51 -07:00
Scott Main
4054a1587a
am 7a086316
: am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '7a086316424925fb33ed470116563712e7754f8b':
2012-04-20 10:38:15 -07:00
Scott Main
217a4d896b
am 9041aa50
: am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '9041aa50fbdb2cff512617a0377385c7d5ada663':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:37:32 -07:00
Scott Main
7a08631642
am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:35:33 -07:00
Scott Main
9041aa50fb
am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:35:12 -07:00
Scott Main
ac2c989e84
am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:35:11 -07:00