Commit Graph

54 Commits

Author SHA1 Message Date
Xin Li 44dd4881de Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I7594bb72dd7e847292eb502edd918e41318aac29
Merged-In: Ide82473d358719f7e01cd2a4a85db954f3722f14
2017-11-14 11:36:22 -08:00
Steven Moreland 58dbc79468 Add HIDL boot-path libs to the PDK.
Adding:
  target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java_intermediates \
  target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java-static_intermediates \
  target/common/obj/JAVA_LIBRARIES/android.hidl.manager-V1.0-java_intermediates \

Ref b/68767391. Currently, Soong java things cannot
build against things in the PDK.

Bug: 68433855
Test: platform.zip contains the 3 added intermediates
Change-Id: I18c556e7f535d9ab8f385b67ae217a2ce2eb8049
2017-11-01 16:27:01 -07:00
Steven Moreland 266632f327 Add hwbinder.jar to PDK.
This is a no-install subset of frameworks.jar. Required
for HIDL libraries to be able to be built against at
build time.

Bug: 68433855
Test: hwbinder_intermediates are in platform.zip
Change-Id: Ia879c6a6908c00069eaf819278c9d5da6a649b68
2017-10-31 21:30:28 +00:00
Colin Cross 69ced5de5e Delete jack support am: a6bc3a8a4c
am: 37bf2b1250

Change-Id: I19133aedbfe91f7cd49588b33f517dc4bb17b91c
2017-10-02 20:00:16 +00:00
Colin Cross e673deb280 Delete jack support
Remove all support for running jack.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
(cherry picked from commit 5db5d31d73)
2017-10-02 11:15:19 -07:00
Colin Cross a6bc3a8a4c Delete jack support
Remove all support for running jack.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
(cherry picked from commit 5db5d31d73)
2017-10-02 18:06:56 +00:00
Dan Willemsen 29fca0148b Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" am: c9916ddbd7 am: e931e59dc6
am: bf9c5c393a

Change-Id: Id1df276d094a94a265561f43ad572b6ba08d7cbd
2017-09-08 23:56:35 +00:00
Dan Willemsen d6ed368fde Remove (TARGET|HOST)_BUILD_TYPE path modifications
They don't really affect anything general in android except for the
output path. Debug builds have been broken due to Soong not respecting
*_BUILD_TYPE, and with ninja, we'll properly rebuild if you switch
between release and debug flags. So just remove the path difference.

Bug: 65453318
Test: TARGET_BUILD_TYPE=debug m
Test: code search to find all the users
Change-Id: I5c6a322e0187d96cdaeef891778508c698f841e0
2017-09-08 14:33:34 -07:00
Guang Zhu 73c10bed93 add CTS tradefed harness dependencies to PDK fusion config
Bug: 38448863
Test: make platform-java, config zip contains added directories
Change-Id: I49627ff9eac5effecb577b3d93ee0e24b3b4ab83
2017-08-30 12:42:45 -07:00
Keun-young Park 37ae422c6f add legacy-android-test java library to PDK platform.zip
- Partners building java test using legacy test API needs it.

bug: 64121067
Test: make platform-java and check if library is in platform.zip
Change-Id: If831f8cc89a386ccb51f46935667057efb3cdf91
2017-07-27 21:27:16 +00:00
Paul Duffin 6470f4fa99 Replace core-junit with legacy-test
m -j32 checkbuild cts droid
adb reboot bootloader
fastboot flashall -w
cts-tradefed run cts -m CtsLibcoreTestCases

Bug: 30188076
Test: As above
Change-Id: I2d49cb3c451cb265d026f9a700a61b3fc0d2ed82
2016-11-30 13:50:56 +00:00
Colin Cross 4b7cd7f43e Merge "Move PDK selection into config.mk" am: 655dd3ea76
am: 3f238d8cda

* commit '3f238d8cda78990a90509206ccd60db7a2f0945a':
  Move PDK selection into config.mk
2016-02-02 20:40:49 +00:00
Colin Cross 6b66fcf378 Move PDK selection into config.mk
config.mk needs to know TARGET_BUILD_PDK in order to select prebuilt
tools.  Move the selection of TARGET_BUILD_PDK into config.mk.

Change-Id: I1f73c92917887f27259b2db64b3779a2fe0df162
2016-02-01 18:05:07 -08:00
Yohann Roussel 00221d45e7 Fix classes.jack extraction from platform.zip
The copy is handled by the common rule, so JAVA_dependency_template
really only needs to add the extra dependencies. Otherwise we were
getting duplicate rule warnings.

This may extract more files than necessary, but that's better than not
enough.

Bug: 26510884
Change-Id: I022f3cc6ddd1982af3f948740917ac03e795f4c5
2016-01-29 11:16:27 -08:00
Keun-young Park c8d7349f86 PDK: add files necessary to for Java build to platform.zip
- add second dex to platform.zip
- pull files from .toc files for jack

bug: 26808715, 26510884

Change-Id: I146bd8cd48a19eea88f147331906bd52f34ea790
2016-01-28 13:02:32 -08:00
Piotr Jastrzebski 052a00f64e Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.

(cherry picked from commit 89b94c827f)

Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
2015-12-24 10:10:55 +00:00
Piotr Jastrzebski 89b94c827f Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.

Change-Id: Ie069c7a93e63b1df854b3137d984b96520562609
2015-11-20 13:53:22 +00:00
Dan Willemsen 05bb4fed0d am edc3e6cd: Merge "Sort more instances of wildcard and find"
* commit 'edc3e6cd6a0d6af4df3d6f07f40de17980b66ad0':
  Sort more instances of wildcard and find
2015-09-30 23:44:10 +00:00
Dan Willemsen 7c3e3f8314 Sort more instances of wildcard and find
Many of these may not make a difference in the output images, but it's a
good idea to keep the make system as repeatable as possible.

Change-Id: I31804b8ad5805148ed08be7426a242a16f4d0df3
2015-09-30 22:25:49 +00:00
Nicholas Sauer d7af937a03 Merge "Add required projects to pdk build on master." 2015-03-27 18:16:04 +00:00
Nicholas Sauer 1b2637e216 Add required projects to pdk build on master.
Added:
-android.test.runner_intermediates
-android-common_intermediates
-bouncycastle_intermediates
-conscrypt_intermediates
-okhttp_intermediates

Removed:
-mms-common_intermediates (which was deprecated)

Also, alphabetize the list.

Change-Id: Ida5ef79b7176edfe006f50d224bcd64b75843832
2015-03-27 09:28:45 -07:00
Nicholas Sauer c2400c3b85 Add classes.jack to the pdk build
Change-Id: I66ce6681976526b35f08cfe9b23bf1a3f12bccc6
2015-03-27 07:58:56 -07:00
Ying Wang 14c975b830 Remove framework2
We don't need fraemwork2 split with the multidex framework.jar.

Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
2014-07-21 14:42:29 -07:00
Colin Cross 1e961acf0c pdk: add core-libart_intermediates
Add out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates
to platform.zip for platform-java builds to allow telephony-common
to build.

Change-Id: I0acbceee976e784573266372071dc1463ea6d53e
2014-06-18 23:22:20 -07:00
Wink Saville 273c22cbc0 Merge kwd to master
Add ims-common support from kwd

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-11 15:21:03 -07:00
Ying Wang 00b83411a2 Add both app_process[32|64] to PDK_SYMBOL_FILES_LIST
We may not be building all of them.
The platform.zip just silently ignores the nonexistent ones.
Also grep out the existing one when eastablishing the dependency in
fusion build.

Actually PDK_SYMBOL_FILES_LIST is used in 2 cases:
1) to build the symbol files into the platform.zip.
2) to establish the dependency on the symbol files
   when doing fusion build.
The previous fix only considered case 2).

Bug: 14997273
Change-Id: I028a5b6c3a3b001efac33d3f56bd2a84f532e5b3
2014-05-15 16:18:09 -07:00
Ying Wang 788c7789b9 Fix the PDK fusion build error of missing symbol file for system/bin/app_process
system/bin/app_process may be a symlink to system/bin/app_process32 or
system/bin/app_process64.

Change-Id: I008bd0a5a801e79144fe2debe27a3a4b4deb1195
2014-05-15 10:54:32 -07:00
Chad Jones 072923238d Expand PDK platform.zip auto-detect to named with vendor/pdk/PRODUCT
Change-Id: Ib813c9333541fa041a0902dab113fb7dc01f7e45
2014-05-02 12:39:02 -07:00
Colin Cross 4b764993a9 pdk: add android_common.jar
Add android_common.jar to the pdk java libraries to allow partners
to build test apps against it.

Change-Id: I3f3c0f6ef086489aec293e10b0d707845b174655
2014-01-29 10:01:37 -08:00
Colin Cross c451a373a4 build: always include host java files in platform.zip
Building recovery requires building a host .jar file.  Change
platform.zip to always include the necessary host java prebuilts,
instead of only when building the 'platform-java' target.

Bug: 12186985
Change-Id: Ic823d764cb6b39bbf8c5d90c94b5dc99b55d34dc
2013-12-18 20:01:38 -08:00
Colin Cross 074d838590 pdk: add bouncycastle-host javalib.jar to platform.zip
Add javalib.jar from bouncycastle-host to the platform.zip to allow
building dumpkey.jar, which is necessary to build recovery.
Host java libraries have no classes.jar, so they have to be kept
in a separate list fromt target java libraries.  Also add an implicit
rule to copy the host files out of the pdk fusion intermediates.

Bug: 12186985
Change-Id: I03ddf9810bc7a4ef7aac8427c4607d9eea27cc6b
2013-12-17 12:06:59 -08:00
Eino-Ville Talvala 735bba8be0 Add android-ex-camera2 static java library to PDK.
Library is located frameworks/ex/camera2/public.
This is required to allow pdk/apps/CameraITS to build in the PDK.

Bug: 10337323
Change-Id: I5b835134012f90462a70b9e38b69c3168df00cfd
2013-09-24 16:57:28 -07:00
keunyoung a219bdc0ba fix build
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy

bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
2013-07-25 18:22:43 -07:00
Tom Cherry 60767620c3 Fix issue with DEBUG_OUT_DIR not properly selected
- patch from NVDIA

bug: 9968564

Change-Id: I2082f989d75fb168fb42947d723de093beff4ff1
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>
2013-07-24 13:55:56 -07:00
Ying Wang 15cbe8e3d4 Add framework2 to the java pdk package.
To fix pdk fusion build.

Change-Id: I5989f38e48614faa742f8362bde841fe084d9c13
2013-07-19 14:37:25 -07:00
keunyoung 3b4856e842 find pdk platform.zip from full_ directory as well for aosp_ products
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
2013-03-28 15:20:38 -07:00
Sungmin Choi 79d51095bb pdk: fix build error on mac
About symlink, show error on Mac.
To fix it, use 'rm' before 'cp'.

error log:
cp: symlink: /data/misc/audio/wcd9310_anc.bin: File exists
make: *** [out/target/product/mako/system/etc/firmware/wcd9310/wcd9310_anc.bin] Error 1

Bug: 8127112

Change-Id: I94e1677a6742cf4350e92bdffd58e6b782cf662c
2013-02-04 10:31:25 -08:00
Wink Saville 554a0adfb7 Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
Add voip-common to various files so that its available when booting
and building. Basically everyplace telephony and mms-common where needed
voip-common was added.

In core/pathmap.mk voip is removed as it is no longer in frameworks/base.

Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
2013-01-28 15:30:58 -08:00
Keun young Park 4da8e127c7 keep PLATFORM_ZIP specified explicitly
- the old behaviour was to override with default one, which makes
  trying different sets of platform.zip difficult if default one exists

Change-Id: I4c8ac2e44d9e7b48f77d628cce3edb20fbdf27e4
2012-08-02 12:51:59 -07:00
Keun young Park 722266918f add symbol files to PDK release for debugging
- app_process is not in PDK, and this makes native debugging difficult
  So provide symbol file instead of source

Bug: 6774048

Change-Id: I1a3a86cf64d8f1d22cdb3a22714f508de963099b
2012-08-01 12:49:01 -07:00
Colin Cross 6fe6c3c22e pdk: add telephony-common and mms-common
Factory test apps may need to compile against telephony-common and
mms-common, include the jars in the pdk platform.zip.

Change-Id: Ic3533ec42115150b94298f15acd877ef61c6660c
2012-07-18 16:06:19 -07:00
Keun young Park f4d1438d85 clean up pdk_config.mk
- define ...JAVA_ZIP_... variables only when necessary
- fix missed case for TARGET_BUILD_JAVA_SUPPORT_LEVEL definition

Change-Id: I4f491ff212fd1e973a77499bbf3fd8d1940bb1f8
2012-06-18 14:44:54 -07:00
Keun young Park efe02ce9e0 add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
  supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media

Bug: 6623618

Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
2012-06-07 15:40:53 -07:00
Keun young Park d8de82fbca ignore touch error happening from broken symbolic link
- maguro platform.zip contains hdcp.keys symbolic link which is broken except env with the key
- this causes error in the touch

Bug: 6555557
Change-Id: I5f9ff5d57c87c0d3038545eeba3b553445a8493c
2012-05-25 12:22:22 -07:00
Keun young Park 816b9fd4e2 enable PDK to use platform JAVA API
- make platform-java will add necessary Java stuffs from out/target/common/
  to platform.zip
- make platform works as before: no Java libraries
- normal fusion build will pick up the file, and define TARGET_BUILD_PDK_JAVA
  besides TARGET_BUILD_PDK if Java stuffs are included
- For TARGET_BUILD_PDK_JAVA, java.mk does not touch LOCAL_SDK_VERSION, which will lead into
  pulling non-SDK Java APIs

Bug: 6482799

Change-Id: I90b1a0b06dc774150711680a6612f2b97b9eab3f
2012-05-24 11:19:31 -07:00
Colin Cross f8dc89b49a Use split-long-arguments to touch pdk platform.zip files
touch $(_pdk_fusion_files) is too long for some systems, use
split-long-arguments to execute touch multiple times with a
subset of the list of files.

Change-Id: I8e8c6770936337b93e0fdf381eca8c79fd722523
2012-04-26 17:04:54 -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
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
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