Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9601e6e0 authored by Ian Kasprzak's avatar Ian Kasprzak
Browse files

Add "with-license" rule to generate public AOSP phone image. 

Bug: 125451157
Test: Verified output in out and dist folders

Additional verification:
- Without the VENDOR_BLOBS_NOTICE build fails
- Output shell artifact displays license as expected
- Shell artifact permissions are correct (ug executable)
- Shell artifact unzips inner zip after license agreement
- Unzipping shell artifact only unzips license.txt file

Change-Id: If1004bd61d873c592c8541a13724eb575f59cddf
parent 654fdb5e

core/tasks/with-license.mk

0 → 100644
+51 −0
Original line number Diff line number Diff line 
# 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))

tools/Android.bp

0 → 100644
+26 −0
Original line number Diff line number Diff line 
// 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,

    },

  },

}