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

Commit 28d098c2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to QQ1A.190922.001 

Change-Id: I13fc70005ffa6c869594e98a8e4756013841e28b
parents 7da9d7cb c9eed652

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=QQ1A.190919.002
 
BUILD_ID=QQ1A.190922.001

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

      PLATFORM_SECURITY_PATCH := 2019-10-05

      PLATFORM_SECURITY_PATCH := 2019-11-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH

tools/fs_config/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 
	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition system \

	   --all-partitions $(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST)) \

	   --all-partitions "$(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST))" \

	   --dirs \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
@@ -124,7 +124,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 
	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition system \

	   --all-partitions $(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST)) \

	   --all-partitions "$(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST))" \

	   --files \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)

tools/fs_config/fs_config_generator.py

+2 −4
Original line number Diff line number Diff line
@@ -1004,10 +1004,6 @@ class FSConfigGen(BaseGenerator): 


        self._partition = args['partition']

        self._all_partitions = args['all_partitions']

        if self._partition == 'system' and self._all_partitions is None:

            sys.exit(

                'All other partitions must be provided if generating output'

                ' for the system partition')



        self._out_file = args['out_file']
@@ -1137,6 +1133,8 @@ class FSConfigGen(BaseGenerator): 
        path = fs_config.path



        if self._partition == 'system':

            if not self._all_partitions:

                return True

            for skip_partition in self._all_partitions.split(','):

                if path.startswith(skip_partition) or path.startswith(

                        'system/' + skip_partition):