Merge remote-tracking branch 'origin/master'

7 files changed, 936 insertions, 78 deletions

diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index 3c784db00..d2f5c186b 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,3 +1,419 @@
 Source: aws-sdk-cpp
-Version: 1.3.58
+Version: 1.4.24
 Description: AWS SDK for C++
+Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
+# Automatically generated by generateFeatures.ps1
+
+Feature: access-management
+Description: C++ SDK for the AWS access-management service
+
+Feature: acm
+Description: C++ SDK for the AWS acm service
+
+Feature: alexaforbusiness
+Description: C++ SDK for the AWS alexaforbusiness service
+
+Feature: apigateway
+Description: C++ SDK for the AWS apigateway service
+
+Feature: application-autoscaling
+Description: C++ SDK for the AWS application-autoscaling service
+
+Feature: appstream
+Description: C++ SDK for the AWS appstream service
+
+Feature: appsync
+Description: C++ SDK for the AWS appsync service
+
+Feature: athena
+Description: C++ SDK for the AWS athena service
+
+Feature: autoscaling
+Description: C++ SDK for the AWS autoscaling service
+
+Feature: autoscaling-plans
+Description: C++ SDK for the AWS autoscaling-plans service
+
+Feature: AWSMigrationHub
+Description: C++ SDK for the AWS AWSMigrationHub service
+
+Feature: batch
+Description: C++ SDK for the AWS batch service
+
+Feature: budgets
+Description: C++ SDK for the AWS budgets service
+
+Feature: ce
+Description: C++ SDK for the AWS ce service
+
+Feature: cloud9
+Description: C++ SDK for the AWS cloud9 service
+
+Feature: clouddirectory
+Description: C++ SDK for the AWS clouddirectory service
+
+Feature: cloudformation
+Description: C++ SDK for the AWS cloudformation service
+
+Feature: cloudfront
+Description: C++ SDK for the AWS cloudfront service
+
+Feature: cloudhsm
+Description: C++ SDK for the AWS cloudhsm service
+
+Feature: cloudhsmv2
+Description: C++ SDK for the AWS cloudhsmv2 service
+
+Feature: cloudsearch
+Description: C++ SDK for the AWS cloudsearch service
+
+Feature: cloudsearchdomain
+Description: C++ SDK for the AWS cloudsearchdomain service
+
+Feature: cloudtrail
+Description: C++ SDK for the AWS cloudtrail service
+
+Feature: codebuild
+Description: C++ SDK for the AWS codebuild service
+
+Feature: codecommit
+Description: C++ SDK for the AWS codecommit service
+
+Feature: codedeploy
+Description: C++ SDK for the AWS codedeploy service
+
+Feature: codepipeline
+Description: C++ SDK for the AWS codepipeline service
+
+Feature: codestar
+Description: C++ SDK for the AWS codestar service
+
+Feature: cognito-identity
+Description: C++ SDK for the AWS cognito-identity service
+
+Feature: cognito-idp
+Description: C++ SDK for the AWS cognito-idp service
+
+Feature: cognito-sync
+Description: C++ SDK for the AWS cognito-sync service
+
+Feature: comprehend
+Description: C++ SDK for the AWS comprehend service
+
+Feature: config
+Description: C++ SDK for the AWS config service
+
+Feature: cur
+Description: C++ SDK for the AWS cur service
+
+Feature: datapipeline
+Description: C++ SDK for the AWS datapipeline service
+
+Feature: dax
+Description: C++ SDK for the AWS dax service
+
+Feature: devicefarm
+Description: C++ SDK for the AWS devicefarm service
+
+Feature: directconnect
+Description: C++ SDK for the AWS directconnect service
+
+Feature: discovery
+Description: C++ SDK for the AWS discovery service
+
+Feature: dms
+Description: C++ SDK for the AWS dms service
+
+Feature: ds
+Description: C++ SDK for the AWS ds service
+
+Feature: dynamodb
+Description: C++ SDK for the AWS dynamodb service
+
+Feature: dynamodbstreams
+Description: C++ SDK for the AWS dynamodbstreams service
+
+Feature: ec2
+Description: C++ SDK for the AWS ec2 service
+
+Feature: ecr
+Description: C++ SDK for the AWS ecr service
+
+Feature: ecs
+Description: C++ SDK for the AWS ecs service
+
+Feature: elasticache
+Description: C++ SDK for the AWS elasticache service
+
+Feature: elasticbeanstalk
+Description: C++ SDK for the AWS elasticbeanstalk service
+
+Feature: elasticfilesystem
+Description: C++ SDK for the AWS elasticfilesystem service
+
+Feature: elasticloadbalancing
+Description: C++ SDK for the AWS elasticloadbalancing service
+
+Feature: elasticloadbalancingv2
+Description: C++ SDK for the AWS elasticloadbalancingv2 service
+
+Feature: elasticmapreduce
+Description: C++ SDK for the AWS elasticmapreduce service
+
+Feature: elastictranscoder
+Description: C++ SDK for the AWS elastictranscoder service
+
+Feature: email
+Description: C++ SDK for the AWS email service
+
+Feature: es
+Description: C++ SDK for the AWS es service
+
+Feature: events
+Description: C++ SDK for the AWS events service
+
+Feature: firehose
+Description: C++ SDK for the AWS firehose service
+
+Feature: gamelift
+Description: C++ SDK for the AWS gamelift service
+
+Feature: glacier
+Description: C++ SDK for the AWS glacier service
+
+Feature: glue
+Description: C++ SDK for the AWS glue service
+
+Feature: greengrass
+Description: C++ SDK for the AWS greengrass service
+
+Feature: guardduty
+Description: C++ SDK for the AWS guardduty service
+
+Feature: health
+Description: C++ SDK for the AWS health service
+
+Feature: iam
+Description: C++ SDK for the AWS iam service
+
+Feature: identity-management
+Description: C++ SDK for the AWS identity-management service
+
+Feature: importexport
+Description: C++ SDK for the AWS importexport service
+
+Feature: inspector
+Description: C++ SDK for the AWS inspector service
+
+Feature: iot
+Description: C++ SDK for the AWS iot service
+
+Feature: iot-data
+Description: C++ SDK for the AWS iot-data service
+
+Feature: iot-jobs-data
+Description: C++ SDK for the AWS iot-jobs-data service
+
+Feature: kinesis
+Description: C++ SDK for the AWS kinesis service
+
+Feature: kinesis-video-archived-media
+Description: C++ SDK for the AWS kinesis-video-archived-media service
+
+Feature: kinesis-video-media
+Description: C++ SDK for the AWS kinesis-video-media service
+
+Feature: kinesisanalytics
+Description: C++ SDK for the AWS kinesisanalytics service
+
+Feature: kinesisvideo
+Description: C++ SDK for the AWS kinesisvideo service
+
+Feature: kms
+Description: C++ SDK for the AWS kms service
+
+Feature: lambda
+Description: C++ SDK for the AWS lambda service
+
+Feature: lex
+Description: C++ SDK for the AWS lex service
+
+Feature: lex-models
+Description: C++ SDK for the AWS lex-models service
+
+Feature: lightsail
+Description: C++ SDK for the AWS lightsail service
+
+Feature: logs
+Description: C++ SDK for the AWS logs service
+
+Feature: machinelearning
+Description: C++ SDK for the AWS machinelearning service
+
+Feature: marketplace-entitlement
+Description: C++ SDK for the AWS marketplace-entitlement service
+
+Feature: marketplacecommerceanalytics
+Description: C++ SDK for the AWS marketplacecommerceanalytics service
+
+Feature: mediaconvert
+Description: C++ SDK for the AWS mediaconvert service
+
+Feature: medialive
+Description: C++ SDK for the AWS medialive service
+
+Feature: mediapackage
+Description: C++ SDK for the AWS mediapackage service
+
+Feature: mediastore
+Description: C++ SDK for the AWS mediastore service
+
+Feature: mediastore-data
+Description: C++ SDK for the AWS mediastore-data service
+
+Feature: meteringmarketplace
+Description: C++ SDK for the AWS meteringmarketplace service
+
+Feature: mobile
+Description: C++ SDK for the AWS mobile service
+
+Feature: mobileanalytics
+Description: C++ SDK for the AWS mobileanalytics service
+
+Feature: monitoring
+Description: C++ SDK for the AWS monitoring service
+
+Feature: mq
+Description: C++ SDK for the AWS mq service
+
+Feature: mturk-requester
+Description: C++ SDK for the AWS mturk-requester service
+
+Feature: opsworks
+Description: C++ SDK for the AWS opsworks service
+
+Feature: opsworkscm
+Description: C++ SDK for the AWS opsworkscm service
+
+Feature: organizations
+Description: C++ SDK for the AWS organizations service
+
+Feature: pinpoint
+Description: C++ SDK for the AWS pinpoint service
+
+Feature: polly
+Description: C++ SDK for the AWS polly service
+
+Feature: pricing
+Description: C++ SDK for the AWS pricing service
+
+Feature: queues
+Description: C++ SDK for the AWS queues service
+
+Feature: rds
+Description: C++ SDK for the AWS rds service
+
+Feature: redshift
+Description: C++ SDK for the AWS redshift service
+
+Feature: rekognition
+Description: C++ SDK for the AWS rekognition service
+
+Feature: resource-groups
+Description: C++ SDK for the AWS resource-groups service
+
+Feature: resourcegroupstaggingapi
+Description: C++ SDK for the AWS resourcegroupstaggingapi service
+
+Feature: route53
+Description: C++ SDK for the AWS route53 service
+
+Feature: route53domains
+Description: C++ SDK for the AWS route53domains service
+
+Feature: s3
+Description: C++ SDK for the AWS s3 service
+
+Feature: s3-encryption
+Description: C++ SDK for the AWS s3-encryption service
+
+Feature: sagemaker
+Description: C++ SDK for the AWS sagemaker service
+
+Feature: sagemaker-runtime
+Description: C++ SDK for the AWS sagemaker-runtime service
+
+Feature: sdb
+Description: C++ SDK for the AWS sdb service
+
+Feature: serverlessrepo
+Description: C++ SDK for the AWS serverlessrepo service
+
+Feature: servicecatalog
+Description: C++ SDK for the AWS servicecatalog service
+
+Feature: servicediscovery
+Description: C++ SDK for the AWS servicediscovery service
+
+Feature: shield
+Description: C++ SDK for the AWS shield service
+
+Feature: sms
+Description: C++ SDK for the AWS sms service
+
+Feature: snowball
+Description: C++ SDK for the AWS snowball service
+
+Feature: sns
+Description: C++ SDK for the AWS sns service
+
+Feature: sqs
+Description: C++ SDK for the AWS sqs service
+
+Feature: ssm
+Description: C++ SDK for the AWS ssm service
+
+Feature: states
+Description: C++ SDK for the AWS states service
+
+Feature: storagegateway
+Description: C++ SDK for the AWS storagegateway service
+
+Feature: sts
+Description: C++ SDK for the AWS sts service
+
+Feature: support
+Description: C++ SDK for the AWS support service
+
+Feature: swf
+Description: C++ SDK for the AWS swf service
+
+Feature: text-to-speech
+Description: C++ SDK for the AWS text-to-speech service
+
+Feature: transcribe
+Description: C++ SDK for the AWS transcribe service
+
+Feature: transfer
+Description: C++ SDK for the AWS transfer service
+
+Feature: translate
+Description: C++ SDK for the AWS translate service
+
+Feature: waf
+Description: C++ SDK for the AWS waf service
+
+Feature: waf-regional
+Description: C++ SDK for the AWS waf-regional service
+
+Feature: workdocs
+Description: C++ SDK for the AWS workdocs service
+
+Feature: workmail
+Description: C++ SDK for the AWS workmail service
+
+Feature: workspaces
+Description: C++ SDK for the AWS workspaces service
+
+Feature: xray
+Description: C++ SDK for the AWS xray service
diff --git a/ports/aws-sdk-cpp/CONTROL.in b/ports/aws-sdk-cpp/CONTROL.in
new file mode 100644
index 000000000..5cf05fdff
--- /dev/null
+++ b/ports/aws-sdk-cpp/CONTROL.in
@@ -0,0 +1,4 @@
+Source: aws-sdk-cpp

+Version: 1.4.21

+Description: AWS SDK for C++

+Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs

diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake
new file mode 100644
index 000000000..a50ed2128
--- /dev/null
+++ b/ports/aws-sdk-cpp/compute_build_only.cmake
@@ -0,0 +1,415 @@
+# Automatically generated by generateFeatures.ps1

+if("access-management" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY access-management)

+endif()

+if("acm" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY acm)

+endif()

+if("alexaforbusiness" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY alexaforbusiness)

+endif()

+if("apigateway" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY apigateway)

+endif()

+if("application-autoscaling" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY application-autoscaling)

+endif()

+if("appstream" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY appstream)

+endif()

+if("appsync" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY appsync)

+endif()

+if("athena" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY athena)

+endif()

+if("autoscaling" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY autoscaling)

+endif()

+if("autoscaling-plans" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY autoscaling-plans)

+endif()

+if("AWSMigrationHub" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY AWSMigrationHub)

+endif()

+if("batch" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY batch)

+endif()

+if("budgets" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY budgets)

+endif()

+if("ce" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY ce)

+endif()

+if("cloud9" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cloud9)

+endif()

+if("clouddirectory" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY clouddirectory)

+endif()

+if("cloudformation" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cloudformation)

+endif()

+if("cloudfront" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cloudfront)

+endif()

+if("cloudhsm" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cloudhsm)

+endif()

+if("cloudhsmv2" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cloudhsmv2)

+endif()

+if("cloudsearch" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cloudsearch)

+endif()

+if("cloudsearchdomain" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cloudsearchdomain)

+endif()

+if("cloudtrail" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cloudtrail)

+endif()

+if("codebuild" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY codebuild)

+endif()

+if("codecommit" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY codecommit)

+endif()

+if("codedeploy" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY codedeploy)

+endif()

+if("codepipeline" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY codepipeline)

+endif()

+if("codestar" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY codestar)

+endif()

+if("cognito-identity" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cognito-identity)

+endif()

+if("cognito-idp" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cognito-idp)

+endif()

+if("cognito-sync" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cognito-sync)

+endif()

+if("comprehend" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY comprehend)

+endif()

+if("config" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY config)

+endif()

+if("cur" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY cur)

+endif()

+if("datapipeline" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY datapipeline)

+endif()

+if("dax" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY dax)

+endif()

+if("devicefarm" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY devicefarm)

+endif()

+if("directconnect" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY directconnect)

+endif()

+if("discovery" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY discovery)

+endif()

+if("dms" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY dms)

+endif()

+if("ds" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY ds)

+endif()

+if("dynamodb" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY dynamodb)

+endif()

+if("dynamodbstreams" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY dynamodbstreams)

+endif()

+if("ec2" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY ec2)

+endif()

+if("ecr" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY ecr)

+endif()

+if("ecs" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY ecs)

+endif()

+if("elasticache" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY elasticache)

+endif()

+if("elasticbeanstalk" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY elasticbeanstalk)

+endif()

+if("elasticfilesystem" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY elasticfilesystem)

+endif()

+if("elasticloadbalancing" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY elasticloadbalancing)

+endif()

+if("elasticloadbalancingv2" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY elasticloadbalancingv2)

+endif()

+if("elasticmapreduce" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY elasticmapreduce)

+endif()

+if("elastictranscoder" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY elastictranscoder)

+endif()

+if("email" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY email)

+endif()

+if("es" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY es)

+endif()

+if("events" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY events)

+endif()

+if("firehose" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY firehose)

+endif()

+if("gamelift" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY gamelift)

+endif()

+if("glacier" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY glacier)

+endif()

+if("glue" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY glue)

+endif()

+if("greengrass" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY greengrass)

+endif()

+if("guardduty" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY guardduty)

+endif()

+if("health" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY health)

+endif()

+if("iam" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY iam)

+endif()

+if("identity-management" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY identity-management)

+endif()

+if("importexport" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY importexport)

+endif()

+if("inspector" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY inspector)

+endif()

+if("iot" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY iot)

+endif()

+if("iot-data" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY iot-data)

+endif()

+if("iot-jobs-data" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY iot-jobs-data)

+endif()

+if("kinesis" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY kinesis)

+endif()

+if("kinesis-video-archived-media" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY kinesis-video-archived-media)

+endif()

+if("kinesis-video-media" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY kinesis-video-media)

+endif()

+if("kinesisanalytics" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY kinesisanalytics)

+endif()

+if("kinesisvideo" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY kinesisvideo)

+endif()

+if("kms" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY kms)

+endif()

+if("lambda" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY lambda)

+endif()

+if("lex" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY lex)

+endif()

+if("lex-models" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY lex-models)

+endif()

+if("lightsail" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY lightsail)

+endif()

+if("logs" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY logs)

+endif()

+if("machinelearning" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY machinelearning)

+endif()

+if("marketplace-entitlement" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY marketplace-entitlement)

+endif()

+if("marketplacecommerceanalytics" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY marketplacecommerceanalytics)

+endif()

+if("mediaconvert" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY mediaconvert)

+endif()

+if("medialive" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY medialive)

+endif()

+if("mediapackage" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY mediapackage)

+endif()

+if("mediastore" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY mediastore)

+endif()

+if("mediastore-data" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY mediastore-data)

+endif()

+if("meteringmarketplace" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY meteringmarketplace)

+endif()

+if("mobile" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY mobile)

+endif()

+if("mobileanalytics" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY mobileanalytics)

+endif()

+if("monitoring" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY monitoring)

+endif()

+if("mq" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY mq)

+endif()

+if("mturk-requester" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY mturk-requester)

+endif()

+if("opsworks" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY opsworks)

+endif()

+if("opsworkscm" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY opsworkscm)

+endif()

+if("organizations" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY organizations)

+endif()

+if("pinpoint" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY pinpoint)

+endif()

+if("polly" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY polly)

+endif()

+if("pricing" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY pricing)

+endif()

+if("queues" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY queues)

+endif()

+if("rds" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY rds)

+endif()

+if("redshift" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY redshift)

+endif()

+if("rekognition" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY rekognition)

+endif()

+if("resource-groups" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY resource-groups)

+endif()

+if("resourcegroupstaggingapi" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY resourcegroupstaggingapi)

+endif()

+if("route53" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY route53)

+endif()

+if("route53domains" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY route53domains)

+endif()

+if("s3" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY s3)

+endif()

+if("s3-encryption" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY s3-encryption)

+endif()

+if("sagemaker" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY sagemaker)

+endif()

+if("sagemaker-runtime" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY sagemaker-runtime)

+endif()

+if("sdb" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY sdb)

+endif()

+if("serverlessrepo" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY serverlessrepo)

+endif()

+if("servicecatalog" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY servicecatalog)

+endif()

+if("servicediscovery" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY servicediscovery)

+endif()

+if("shield" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY shield)

+endif()

+if("sms" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY sms)

+endif()

+if("snowball" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY snowball)

+endif()

+if("sns" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY sns)

+endif()

+if("sqs" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY sqs)

+endif()

+if("ssm" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY ssm)

+endif()

+if("states" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY states)

+endif()

+if("storagegateway" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY storagegateway)

+endif()

+if("sts" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY sts)

+endif()

+if("support" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY support)

+endif()

+if("swf" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY swf)

+endif()

+if("text-to-speech" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY text-to-speech)

+endif()

+if("transcribe" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY transcribe)

+endif()

+if("transfer" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY transfer)

+endif()

+if("translate" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY translate)

+endif()

+if("waf" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY waf)

+endif()

+if("waf-regional" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY waf-regional)

+endif()

+if("workdocs" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY workdocs)

+endif()

+if("workmail" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY workmail)

+endif()

+if("workspaces" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY workspaces)

+endif()

+if("xray" IN_LIST FEATURES)

+  list(APPEND BUILD_ONLY xray)

+endif()

diff --git a/ports/aws-sdk-cpp/disable_warning_as_error.patch b/ports/aws-sdk-cpp/disable_warning_as_error.patch
deleted file mode 100644
index ec5587eb8..000000000
--- a/ports/aws-sdk-cpp/disable_warning_as_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
-index 36795a2..77334ee 100644
---- a/cmake/compiler_settings.cmake
-+++ b/cmake/compiler_settings.cmake
-@@ -57,7 +57,7 @@ endif()
- if(MSVC)
-     # warnings as errors, max warning level (4)
-     if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
--        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-+        #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-     endif()
- 
-     # taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
diff --git a/ports/aws-sdk-cpp/drop_git.patch b/ports/aws-sdk-cpp/drop_git.patch
deleted file mode 100644
index 491831bd7..000000000
--- a/ports/aws-sdk-cpp/drop_git.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9d2a98a..ce58b68 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,7 +22,7 @@ if(CMAKE_MAJOR_VERSION LESS 3)
- endif()
- 
- # git is required for Android builds and optional for all other platforms
--find_package(Git)
-+#find_package(Git)
- 
- # Cmake invocation variables:
- #   CUSTOM_MEMORY_MANAGEMENT - if set to 1, generates the sdk project files with custom memory management enabled, otherwise disables it
diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1
new file mode 100644
index 000000000..8c8b1a342
--- /dev/null
+++ b/ports/aws-sdk-cpp/generateFeatures.ps1
@@ -0,0 +1,51 @@
+[CmdletBinding()]

+param(

+    [Parameter(Mandatory=$true)][string]$ExtractedSources,

+    [Parameter(Mandatory=$true)][string]$ControlFileIn,

+    [Parameter(Mandatory=$true)][string]$ControlFile,

+    [Parameter(Mandatory=$true)][string]$CMakeFragmentFile

+)

+

+$subfolders = Get-Item $ExtractedSources\aws-cpp-sdk-*

+

+$controltext = gc $ControlFileIn

+$controltext += @("# Automatically generated by generateFeatures.ps1")

+

+$cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1")

+

+function GetDescription($dir, $modulename)

+{

+    if (Test-Path "$dir\CMakeLists.txt")

+    {

+        $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"")

+        if ($descs.count -eq 1) {

+            $desc = $descs[0].Matches.Value -replace "`"",""

+            "Description: $desc"

+        }

+        else { "Description: C++ SDK for the AWS $modulename service" }

+    }

+    else { "Description: C++ SDK for the AWS $modulename service" }

+}

+

+$subfolders | % {

+    $modulename = $_.name -replace "^aws-cpp-sdk-",""

+    if ($modulename -match "-tests`$") { return }

+    if ($modulename -match "-sample`$") { return }

+    if ($modulename -eq "core") { return }

+

+    $controltext += @("")

+    $controltext += @("Feature: $modulename")

+    $controltext += @(GetDescription $_ $modulename)

+

+    $cmakefragmenttext += @(

+        "if(`"$modulename`" IN_LIST FEATURES)",

+        "  list(APPEND BUILD_ONLY $modulename)",

+        "endif()"

+    )

+}

+

+Write-Verbose ($controltext -join "`n")

+[IO.File]::WriteAllText($ControlFile, ($controltext -join "`n")+"`n")

+

+Write-Verbose ($cmakefragmenttext -join "`n")

+[IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n")

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index d21932496..28097ee1a 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -3,79 +3,77 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
-    REF 1.3.58
-    SHA512 755fe3fd9d507a43fb03c1530a979f5a5a2848588ccab39509987043b3d274f27a7b163bf078a006123450ee881fd4a092cd703246f6f669810f47c186c2b0b8
+    REF 1.4.24
+    SHA512 bda259caeeb909884128268f0dfe3ca58ce665be2a0304302f1fd09c4217cbcd34c20119009123aeb80377dfe5144b72cbd98d2acbdc9ffa729c09e380751bf2
     HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES 
-		${CMAKE_CURRENT_LIST_DIR}/drop_git.patch
-		${CMAKE_CURRENT_LIST_DIR}/disable_warning_as_error.patch
-)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
 
-if(VCPKG_CRT_LINKAGE STREQUAL static)
-	set(FORCE_SHARED_CRT OFF)
-else()
-	set(FORCE_SHARED_CRT ON)
-endif()
+set(BUILD_ONLY core)
+
+include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
+
+# This handles escaping the list
+string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-	PREFER_NINJA
-	OPTIONS
-		-DENABLE_TESTING=OFF
-		-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}
+    PREFER_NINJA
+    OPTIONS
+        -DENABLE_UNITY_BUILD=ON
+        -DENABLE_TESTING=OFF
+        -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}
+        -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
+        "-DBUILD_ONLY=${BUILD_ONLY}"
 )
 
 vcpkg_install_cmake()
 
-file(GLOB CMAKE_FILES ${CURRENT_PACKAGES_DIR}/lib/cmake/*)
-
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
-
-file(COPY ${CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
 
 vcpkg_copy_pdbs()
 
-file(GLOB AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/aws-cpp-sdk-*/aws-cpp-sdk-*targets.cmake")
-foreach(AWS_TARGETS ${AWS_TARGETS})
-    file(READ ${AWS_TARGETS} _contents)
+file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake")
+foreach(AWS_TARGET IN LISTS AWS_TARGETS)
+    file(READ ${AWS_TARGET} _contents)
     string(REGEX REPLACE
-        "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*"
-        "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
+        "bin\\/([A-Za-z0-9_.-]+\\.lib)"
+        "lib/\\1"
         _contents "${_contents}")
-    file(WRITE ${AWS_TARGETS} "${_contents}")
+    file(WRITE ${AWS_TARGET} "${_contents}")
 endforeach()
 
-file(GLOB AWS_TARGETS_RELEASE "${CURRENT_PACKAGES_DIR}/share/aws-cpp-sdk-*/aws-cpp-sdk-*targets-release.cmake")
-foreach(AWS_TARGETS_RELEASE ${AWS_TARGETS_RELEASE})
-    file(READ ${AWS_TARGETS_RELEASE} _contents)
-    string(REGEX REPLACE
-        "bin\\/([A-Za-z0-9_.-]+lib)"
-        "lib/\\1"
-        _contents "${_contents}")
-    file(WRITE ${AWS_TARGETS_RELEASE} "${_contents}")
+file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake")
+list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$")
+foreach(AWS_CONFIG IN LISTS AWS_CONFIGS)
+    file(READ "${AWS_CONFIG}" _contents)
+    file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}")
 endforeach()
 
-file(REMOVE_RECURSE 
-	${CURRENT_PACKAGES_DIR}/debug/include
-	${CURRENT_PACKAGES_DIR}/lib/cmake
-	${CURRENT_PACKAGES_DIR}/lib/pkgconfig
-	${CURRENT_PACKAGES_DIR}/debug/lib/cmake
-	${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig
-	${CURRENT_PACKAGES_DIR}/nuget
-	${CURRENT_PACKAGES_DIR}/debug/nuget)
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+    ${CURRENT_PACKAGES_DIR}/share/AWSSDK
+    ${CURRENT_PACKAGES_DIR}/lib/pkgconfig
+    ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig
+    ${CURRENT_PACKAGES_DIR}/nuget
+    ${CURRENT_PACKAGES_DIR}/debug/nuget
+)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-	file(GLOB LIB_FILES          ${CURRENT_PACKAGES_DIR}/bin/*.lib)
-	file(GLOB DEBUG_LIB_FILES    ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib)
-	file(COPY ${LIB_FILES}       DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-	file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-	file(REMOVE ${LIB_FILES} ${DEBUG_LIB_FILES})
-	
-	file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#define USE_IMPORT_EXPORT")
+    file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib)
+    if(LIB_FILES)
+        file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+        file(REMOVE ${LIB_FILES})
+    endif()
+    file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib)
+    if(DEBUG_LIB_FILES)
+        file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+        file(REMOVE ${DEBUG_LIB_FILES})
+    endif()
+
+    file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif")
 endif()
 
 # Handle copyright