diff options
author | Ian Kasprzak <iankaz@google.com> | 2019-11-11 09:11:26 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-11 09:11:26 -0800 |
commit | b7ef598a6f40a1b37f48ad16f45058ea2b9b85cb (patch) | |
tree | 6d87f1eb128d4c112f90731674f50010c5875533 | |
parent | 86783d4e33f8e2852373f455167bd8184bb743eb (diff) | |
parent | 9a5a603b33afad730f4e80cea355f2a3ac408d6b (diff) | |
download | build-b7ef598a6f40a1b37f48ad16f45058ea2b9b85cb.tar.gz |
Merge "Add "with-license" rule to generate public AOSP phone image." am: 44b20aca98
am: 9a5a603b33
Change-Id: I9ad2114f21e822946ebcb5522306af7090565dc0
-rw-r--r-- | core/tasks/with-license.mk | 51 | ||||
-rw-r--r-- | tools/Android.bp | 26 |
2 files changed, 77 insertions, 0 deletions
diff --git a/core/tasks/with-license.mk b/core/tasks/with-license.mk new file mode 100644 index 0000000000..1f7ae893c9 --- /dev/null +++ b/core/tasks/with-license.mk @@ -0,0 +1,51 @@ +# Copyright (C) 2019 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +.PHONY: with-license + +name := $(TARGET_PRODUCT) +ifeq ($(TARGET_BUILD_TYPE),debug) + name := $(name)_debug +endif + +name := $(name)-img-$(FILE_NAME_TAG)-with-license + +with_license_intermediates := \ + $(call intermediates-dir-for,PACKAGING,with_license) + +# Create a with-license artifact target +license_image_input_zip := $(with_license_intermediates)/$(name).zip +$(license_image_input_zip) : $(BUILT_TARGET_FILES_PACKAGE) $(ZIP2ZIP) +# DO NOT PROCEED without a license file. +ifndef VENDOR_BLOBS_NOTICE + @echo "with-license requires VENDOR_BLOBS_NOTICE to be set." + exit 1 +else + $(ZIP2ZIP) -i $(BUILT_TARGET_FILES_PACKAGE) -o $@ \ + RADIO/bootloader.img:bootloader.img RADIO/radio.img:radio.img \ + IMAGES/system.img:system.img IMAGES/vendor.img:vendor.img \ + IMAGES/boot.img:boot.img OTA/android-info.txt:android-info.txt +endif +with_license_zip := $(PRODUCT_OUT)/$(name).sh +$(with_license_zip): PRIVATE_NAME := $(name) +$(with_license_zip): PRIVATE_INPUT_ZIP := $(license_image_input_zip) +$(with_license_zip): PRIVATE_VENDOR_BLOBS_NOTICE := $(VENDOR_BLOBS_NOTICE) +$(with_license_zip): $(license_image_input_zip) $(VENDOR_BLOBS_NOTICE) +$(with_license_zip): $(HOST_OUT_EXECUTABLES)/generate-self-extracting-archive + # Args: <output> <input archive> <comment> <license file> + $(HOST_OUT_EXECUTABLES)/generate-self-extracting-archive $@ \ + $(PRIVATE_INPUT_ZIP) $(PRIVATE_NAME) $(PRIVATE_VENDOR_BLOBS_NOTICE) +with-license : $(with_license_zip) +$(call dist-for-goals, with-license, $(with_license_zip)) diff --git a/tools/Android.bp b/tools/Android.bp new file mode 100644 index 0000000000..8c7eb38373 --- /dev/null +++ b/tools/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +python_binary_host { + name: "generate-self-extracting-archive", + srcs: ["generate-self-extracting-archive.py"], + version: { + py2: { + enabled: true, + }, + py3: { + enabled: false, + }, + }, +} |