Commit graph

522 commits

Author SHA1 Message Date
Nan Zhang
0abdb5811d Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Colin Cross
ce8c05196d Partially revert BUILD_DATETIME change
Change Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901 caused kati to
regenerate on every build:
$(shell cat out/build_date.txt) was changed, regenerating...
Switch back to $(shell date +%s) which is special cased in kati
to not cause a regeneration.  Everything besides DATE will still
use BUILD_DATETIME_FROM_FILE from soong_ui.

Once BUILD_NUMBER is moved to soong_ui $(DATE) is no longer
necessary and the whole thing can be removed.

Bug: 70351683
Bug: 73352417
Test: m && m doesn't regenerate
Test: m BUILD_DATETIME=1234 shows up in ro.build.version.incremental
Change-Id: I8444beb2b47a49095ef760083fc85f220821bffe
2018-02-16 09:41:24 -08:00
Nan Zhang
975f41ed34 Remove BUILD_DATETIME from Make.
Soong_UI will handle build timestamp and export date file to Make.

Test: m -j32
Bug: b/70351683
Change-Id: Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901
2018-02-14 13:30:53 -08:00
Jiyong Park
641b6cc6b0 Add PLATFORM_SYSTEMSDK_VERSIONS and BOARD_SYSTEMSDK_VERSIONS
PLATFORM_SYSTEMSDK_VERSIONS is the list of System SDK versions that the
platform is supporting. Contrary to the public SDK where platform
essentially supports all previous SDK versions, platform support only a
few recent System SDK versions, since some of old System APIs are
gradually deprecated, removed from the following SDKs and then finally
deleted from the platform. This will be part of the framework manifest.

The list can be specified by setting PLATFORM_SYSTEMSDK_MIN_VERSION. If
it is set to an old version number, then System SDKs from the version
to the current version (PLATFORM_SDK_VERSION) are considered to be
supported by the platform. If PLATFORM_SYSTEMSDK_MIN_VERSION is not set,
only the latest System SDK version is supported.

Next, BOARD_SYSTEMSDK_VERSIONS is the list of System SDK versions that
the device is using. This is put to the device compatibility matrix
device is using. The device and the platform is considered as compatible
only BOARD_SYSTEMSDK_VERSIONS in the device compatibility matrix are
in the PLATFORM_SYSTEMSDK_VERSIONS in the framework manifest.

When BOARD_SYSTEMSDK_VERSIONS is set, a Java app or library in vendor or
odm partitions which didn't specify LOCAL_SDK_VERSION  is forced to use
System SDK. Also, the build system does the additional integrity check
to ensure that LOCAL_SDK_VERSION is within BOARD_SYSTEMSDK_VERSIONS or
PLATFORM_SYSTEMSDK_VERSIONS (if BOARD_SYSTEMSDK_VERSIONS isn't set).

Bug: 69088799
Test: m -j
Test: BOARD_SYSTEMSDK_VERSIONS=P m -j
Change-Id: If4d59f6030e4cc402e015701d0caf94aeec37263
2018-01-19 15:42:05 +09:00
Justin Yun
729856a5f2 Use PLATFORM_VERSION_CODENAME for VNDK version
Before Android version is released, we may use
PLATFORM_VERSION_CODENAME for PLATFORM_VNDK_VERSION to add version
suffix to VNDK directories.

Bug: 70584135
Test: Test youtube and RS apps
Change-Id: Ie788544740a5257232abc2c9acbce64749d15602
2017-12-21 08:13:32 +09:00
Justin Yun
2a233b3b86 Define PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
Adam Seaton
ed0f11b63d Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa am: 893343fa7b
am: bb8028e3f3

Change-Id: Iccb8100ab0c8d15d49bfd7e68c0bbae3df0b0e2a
2017-10-15 02:00:11 +00:00
Adam Seaton
bb8028e3f3 Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa
am: 893343fa7b

Change-Id: I36ee53034b19c59b5d070c8c45f404b031fe9783
2017-10-15 01:53:27 +00:00
Adam Seaton
893343fa7b Update Security String to 2017-12-01 For December Security Bug: 67774760
am: 47ac5ac8aa

Change-Id: I89f4e9a4c5ec1c57cadb66605643a953f391969b
2017-10-15 01:36:32 +00:00
Adam Seaton
47ac5ac8aa Update Security String to 2017-12-01 For December Security
Bug: 67774760
2017-10-13 18:20:07 +00:00
TreeHugger Robot
b97c97b643 Merge "Add P back to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp 2017-10-03 01:11:06 +00:00
Colin Cross
e13a588aa6 Add P back to oc-mr1-dev-plus-aosp
Specialzing O MR1 shouldn't have removed P from oc-mr1-dev-plus-aosp.

Test: none
Change-Id: Ida774a3bc6fa7884e328eb70abb6b2cca7c32028
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
2017-10-02 18:08:51 -07:00
Colin Cross
69ced5de5e Delete jack support am: a6bc3a8a4c
am: 37bf2b1250

Change-Id: I19133aedbfe91f7cd49588b33f517dc4bb17b91c
2017-10-02 20:00:16 +00:00
Colin Cross
37bf2b1250 Delete jack support
am: a6bc3a8a4c

Change-Id: Ie8353581a40916a1f267be9127f0fe2603119f34
2017-10-02 19:47:22 +00: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
Adam Seaton
c6f2363c5e Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2 am: 6b7c615cb6
am: db4b460d4b

Change-Id: I60112d1f0980ad0707ddf757735d73e62b4d7817
2017-09-13 22:15:19 +00:00
Adam Seaton
eb202ed342 Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131 am: 8e3eac06fb
am: 813eb5e81d

Change-Id: Ib1cb2b5d8789b8b43de101786ceb00d98e156afa
2017-09-13 22:15:05 +00:00
Adam Seaton
db4b460d4b Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
am: 6b7c615cb6

Change-Id: Ia0a597ebe1b74390761e51481cf90a20e6376b31
2017-09-13 21:56:15 +00:00
Adam Seaton
813eb5e81d Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
am: 8e3eac06fb

Change-Id: Icd9ef222b91081a89b386d124eeed39d0caa6df8
2017-09-13 21:56:02 +00:00
Adam Seaton
6b7c615cb6 Update Security String to 2017-11-05 on oc-dev bug:65631379
am: d24487a2f2

Change-Id: Ib474659c9e72e5ad803a0e28f9fb11b7057d4939
2017-09-13 21:30:22 +00:00
Adam Seaton
8e3eac06fb Update Security String to 2017-11-01 on oc-dev bug:65631379
am: 8f4a4c2131

Change-Id: Iee28cf19c5020c8dde26c1a25a92609ee7221c8d
2017-09-13 21:29:44 +00:00
Adam Seaton
d24487a2f2 Update Security String to 2017-11-05 on oc-dev bug:65631379 2017-09-13 10:51:18 -07:00
Adam Seaton
8f4a4c2131 Update Security String to 2017-11-01 on oc-dev bug:65631379 2017-09-13 10:46:41 -07:00
Ian Pedowitz
21873fbd4f Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev
am: 418b291486

Change-Id: Idfe46f6fb6b1aedae5a42445cd196204303c199b
2017-09-07 14:50:05 +00:00
Ian Pedowitz
62a835d0ef DO NOT MERGE OC-MR1 is REL
Bug: 64982450
Test: manual
Change-Id: I054e3ecff49803e61e7741753fe6764a567d72c4
2017-09-06 13:12:42 -07:00
Michael Wright
f6b3316bbe Merge "O MR1 is API 27" into oc-mr1-dev
am: 0ba9648a13

Change-Id: I092105b03769e3b5f7560d12f19ae3b88de95a7c
2017-08-26 02:40:47 +00:00
Michael Wright
5d8410b60a O MR1 is API 27
Bug: 64982450
Test: manual
Change-Id: I0d59724f1bcb8091488f23cd5d98d2688009b605
2017-08-23 18:23:06 -07:00
Adam Seaton
d8115fb4f9 Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: ca22b203d0
am: 1b17813951

Change-Id: I9f2545f1f1c54edbaee396dc662111fa9b228769
2017-08-22 22:48:45 +00:00
Adam Seaton
bf413aa70d Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: f3ae135ddb

Change-Id: If58e6b190e312f3fd4eb600b18689f396c8efb2f
2017-08-22 22:48:23 +00:00
Adam Seaton
50bd0fa2cc Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 55b78726b4
am: 2174b6e355

Change-Id: If6ccc8963facaa0794f51b67718b7c2770e506e0
2017-08-22 22:48:10 +00:00
Adam Seaton
90b1c82d83 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 834db8c201

Change-Id: I2acc807fc3b4fdaea5592ea0b885cb206284a211
2017-08-22 22:47:53 +00:00
Adam Seaton
1b17813951 Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: ca22b203d0

Change-Id: I65b91c3e3acfa25af3792ddb86d9da418daaae8b
2017-08-22 22:41:59 +00:00
Adam Seaton
2174b6e355 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 55b78726b4

Change-Id: I2454bd68b62032987f67cf00aa02f246fa097325
2017-08-22 22:41:28 +00:00
Adam Seaton
f3ae135ddb Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: Idc4c93c54a778c37b5d916ef9dc71eaafc8eff89
2017-08-22 22:37:48 +00:00
Adam Seaton
ca22b203d0 Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: I6b3fcb447c334206889a635178cda68f6bb20131
2017-08-22 22:37:09 +00:00
Adam Seaton
834db8c201 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I26c3283c5fd33ee1e930840ad6b82019eba1ebc6
2017-08-22 22:37:00 +00:00
Adam Seaton
55b78726b4 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I56396b94ed83855dc0c0f86c99fffa46120b92eb
2017-08-22 22:36:22 +00:00
Adam Seaton
4e140ce86a Update platform security string to 2017-10-05 in oc-dev Bug:64896113 2017-08-21 11:37:32 -07:00
Adam Seaton
80d3742026 Update platform security string to 2017-10-01 in oc-dev Bug:64896113 2017-08-21 11:36:54 -07:00
Amit Pawar
faa0c8a45b Merge "oc-mr1-dev is now 8.1.0" into oc-mr1-dev
am: f01a5ef7c3

Change-Id: I6cb15b97e680448d1d459d9a4dd67b7b520a31a9
2017-08-16 20:47:50 +00:00
Ian Pedowitz
47f1b93dfa v8.0.0 was only temporary. O-DR is 8.0.0
Fixes: 64130669
Fixes: 64125438
Fixes: 64437834
Test: Flashed oc-dr1-dev ToT and ensured device booted
Test: Rebuilt with topic:ODR-8.0.0 and reflashed without wipe
Test: device booted
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: I1316358d0121b82902ac708088a49d480f3a6ad4
2017-08-09 12:06:37 -07:00
Amit Pawar
98c2735b82 oc-mr1-dev is now 8.1.0
Bug: 62103626
Test: In progress
Change-Id: I53d2248669892e200d1e5d966027f35f38a8a1f8
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
2017-08-04 21:21:59 +00:00
Ian Pedowitz
17a100af91 Merge "Making a comment a bit more explicit" into oc-mr1-dev
am: 9a50c8507a

Change-Id: I459e3f9410d2fed7788dda4206ef2b7447c5b3cd
2017-08-04 17:01:10 +00:00
Ian Pedowitz
f28bf722c2 Making a comment a bit more explicit
Bug: 64364822
Test: N/A comment only
Change-Id: I4ef65aef4521326ac48539ad27422f881cc3e883
2017-08-03 17:38:26 -07:00
Bart Sears
a302746d9b Change Android version to v8.0.0
Change PLATFORM_VERSION.OPD1 to v8.0.0.  This is a temporary
change until we get a new KeyMaster that can handle going from
8.0.1 -> 8.0.0.  At that point we will change PLATFORM_VERSION
to 8.0.0.

Test: Check: Settings > System > About phone > Android version.
Also verified that update from 8.0.1 to v8.0.0 works (i.e. device
boots and shows new Android Version).
Bug: 64130669
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: Ibb8fbb123a74196f57f649d0c22f58beefaf6d06
2017-08-03 16:23:59 -07:00
Dan Albert
86b295be2e Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f am: 5ebfa32c53 am: 373d682c69
am: 3626b53135

Change-Id: I0cb5a3afeec15c62228dc767beb93e60b0478056
2017-08-03 02:42:43 +00:00
Dan Albert
3626b53135 Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f am: 5ebfa32c53
am: 373d682c69

Change-Id: I28413287340f0206ecea05896da74cce815e7d1f
2017-08-03 02:37:40 +00:00
Dan Albert
373d682c69 Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f
am: 5ebfa32c53

Change-Id: Ic4abaf6dc95b037858beb969b41b3b52bd057afb
2017-08-03 02:32:40 +00:00
Dan Albert
5ebfa32c53 Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES."
am: 577ff4730f

Change-Id: Ib42278524d19d1a464b9357b78c5fd05e6736e04
2017-08-03 02:27:41 +00:00
Dan Albert
cd38b86016 Add PLATFORM_VERSION_FUTURE_CODENAMES.
PLATFORM_VERSION_ALL_CODENAMES isn't actually all the code names, just
the ones active in our current target. We need the list of all targets
so we can validate code names in NDK stub templates even if they're in
the future. Unfortunately, all_codenames has been baked into
build.prop for ages, so we're stuck with this name. Improve the
comments and add PLATFORM_VERSION_FUTURE_CODENAMES to cover to cover
the future targets.

Test: make checkbuild
Test: check $ANDROID_PRODUCT_OUT/system/build.prop
Bug: None
Change-Id: I81fed6f761e5362ef3050be9d1e3fb17739feadd
2017-08-02 17:17:41 -07:00